author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
254,875
|
03.11.2021 17:29:48
| -28,800
|
a6aad76f10526d21fdcac77e1510e0362612c5c6
|
fix minio annotation
|
[
{
"change_type": "MODIFY",
"old_path": "pkg/cluster/controllers/storage/ingress.go",
"new_path": "pkg/cluster/controllers/storage/ingress.go",
"diff": "@@ -4,7 +4,7 @@ import (\n\"context\"\ngoharborv1 \"github.com/goharbor/harbor-operator/apis/goharbor.io/v1beta1\"\n- \"github.com/goharbor/harbor-operator/apis/meta/v1alpha1\"\n+ harbormetav1 \"github.com/goharbor/harbor-operator/apis/meta/v1alpha1\"\n\"github.com/goharbor/harbor-operator/pkg/cluster/controllers/common\"\nminiov2 \"github.com/goharbor/harbor-operator/pkg/cluster/controllers/storage/minio/apis/minio.min.io/v2\"\n\"github.com/goharbor/harbor-operator/pkg/cluster/lcm\"\n@@ -105,31 +105,55 @@ func (m *MinIOController) cleanupIngress(ctx context.Context, harborcluster *goh\nreturn minioUnknownStatus(), nil\n}\n-func (m *MinIOController) generateIngress(ctx context.Context, harborcluster *goharborv1.HarborCluster) *netv1.Ingress { // nolint:funlen\n- var tls []netv1.IngressTLS\n+func (m *MinIOController) getMinioIngressAnnotations(harborcluster *goharborv1.HarborCluster) map[string]string {\n+ isEnableExpose := false\n+ if harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose != nil {\n+ isEnableExpose = true\n+ }\n- if harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose != nil &&\n- harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.TLS.Enabled() {\n- tls = []netv1.IngressTLS{{\n- SecretName: harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.TLS.CertificateRef,\n- Hosts: []string{harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.Ingress.Host},\n- }}\n+ istls := false\n+ if isEnableExpose && harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.TLS.Enabled() {\n+ istls = true\n}\n- annotations := make(map[string]string)\n- annotations[\"nginx.ingress.kubernetes.io/proxy-body-size\"] = \"0\"\n+ annotations := map[string]string{\n+ // resolve 413(Too Large Entity) error when push large image. It only works for NGINX ingress.\n+ \"nginx.ingress.kubernetes.io/proxy-body-size\": \"0\",\n+ }\n- if harborcluster.Spec.Expose.Core.Ingress != nil && harborcluster.Spec.Expose.Core.Ingress.Controller == v1alpha1.IngressControllerNCP {\n+ if isEnableExpose && harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.Ingress.Controller == harbormetav1.IngressControllerNCP {\nannotations[\"ncp/use-regex\"] = NCPIngressValueTrue\n- if tls != nil {\n+ if istls {\nannotations[\"ncp/http-redirect\"] = NCPIngressValueTrue\n}\n- } else if harborcluster.Spec.Expose.Core.Ingress != nil && harborcluster.Spec.Expose.Core.Ingress.Controller == v1alpha1.IngressControllerContour {\n- if tls != nil {\n+ } else if harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.Ingress.Controller == harbormetav1.IngressControllerContour {\n+ if istls {\nannotations[\"ingress.kubernetes.io/force-ssl-redirect\"] = ContourIngressValueTrue\n}\n}\n+ if isEnableExpose {\n+ for key, value := range harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.Ingress.Annotations {\n+ annotations[key] = value\n+ }\n+ }\n+\n+ return annotations\n+}\n+\n+func (m *MinIOController) generateIngress(ctx context.Context, harborcluster *goharborv1.HarborCluster) *netv1.Ingress {\n+ var tls []netv1.IngressTLS\n+\n+ if harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose != nil &&\n+ harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.TLS.Enabled() {\n+ tls = []netv1.IngressTLS{{\n+ SecretName: harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.TLS.CertificateRef,\n+ Hosts: []string{harborcluster.Spec.Storage.Spec.MinIO.Redirect.Expose.Ingress.Host},\n+ }}\n+ }\n+\n+ annotations := m.getMinioIngressAnnotations(harborcluster)\n+\npathTypePrefix := netv1.PathTypePrefix\ningress := &netv1.Ingress{\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix minio annotation
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,890
|
18.11.2021 11:01:29
| -28,800
|
8fd9f5432173fbc24a18e41440675d220fa0d7cd
|
chore: build controller-gen and stringer in temp dir
Build the controller-gen and stringer in temp dir to avoid the version of harbor pkg always changing in github actions.
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -520,9 +520,15 @@ controller-gen:\n$(CONTROLLER_GEN):\n$(MAKE) $(BIN)\n# https://github.com/kubernetes-sigs/controller-tools/tree/master/cmd/controller-gen\n- go get 'sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_GEN_VERSION)'\n- go build -mod=readonly -o $(CONTROLLER_GEN) sigs.k8s.io/controller-tools/cmd/controller-gen\n- go mod tidy\n+ @{ \\\n+ set -e ;\\\n+ CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\\\n+ cd $$CONTROLLER_GEN_TMP_DIR ;\\\n+ go mod init tmp ;\\\n+ go get sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_GEN_VERSION) ;\\\n+ go build -mod=readonly -o $(CONTROLLER_GEN) sigs.k8s.io/controller-tools/cmd/controller-gen ;\\\n+ rm -rf $$CONTROLLER_GEN_TMP_DIR ;\\\n+ }\n# find or download markdownlint\n# download markdownlint if necessary\n@@ -640,9 +646,15 @@ stringer:\n$(STRINGER):\n$(MAKE) $(BIN)\n# https://pkg.go.dev/golang.org/x/tools/cmd/stringer\n- go get 'golang.org/x/tools/cmd/stringer@$(STRINGER_VERSION)'\n- go build -mod=readonly -o $(STRINGER) golang.org/x/tools/cmd/stringer\n- go mod tidy\n+ @{ \\\n+ set -e ;\\\n+ STRINGER_TMP_DIR=$$(mktemp -d) ;\\\n+ cd $$STRINGER_TMP_DIR ;\\\n+ go mod init tmp ;\\\n+ go get golang.org/x/tools/cmd/stringer@$(STRINGER_VERSION) ;\\\n+ go build -mod=readonly -o $(STRINGER) golang.org/x/tools/cmd/stringer ;\\\n+ rm -rf $$STRINGER_TMP_DIR ;\\\n+ }\n# find or download hadolint\n# download hadolint if necessary\n"
},
{
"change_type": "MODIFY",
"old_path": "go.mod",
"new_path": "go.mod",
"diff": "@@ -9,7 +9,7 @@ require (\ngithub.com/go-kit/kit v0.10.0\ngithub.com/go-logr/logr v0.4.0\ngithub.com/go-redis/redis v6.15.9+incompatible\n- github.com/goharbor/harbor/src v0.0.0-20211112031241-d260e632d85c\n+ github.com/goharbor/harbor/src v0.0.0-20211025104526-d4affc2eba6d\ngithub.com/huandu/xstrings v1.3.2 // indirect\ngithub.com/jaegertracing/jaeger-lib v2.2.0+incompatible\ngithub.com/jetstack/cert-manager v1.1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "go.sum",
"new_path": "go.sum",
"diff": "@@ -496,8 +496,8 @@ github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5\ngithub.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=\ngithub.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=\ngithub.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=\n-github.com/goharbor/harbor/src v0.0.0-20211112031241-d260e632d85c h1:a2/EtiS4G9YCoKVoslPdzAhAP8/skePzqlEraWrt1Jc=\n-github.com/goharbor/harbor/src v0.0.0-20211112031241-d260e632d85c/go.mod h1:5WKePD4Y8lsPoD5xQy887gFC97EC6vNbJVBcbva/8ws=\n+github.com/goharbor/harbor/src v0.0.0-20211025104526-d4affc2eba6d h1:/ZsWt+7vAimZd7g0P7JMoy5gc/QO6qf6HV2cPsGPHCU=\n+github.com/goharbor/harbor/src v0.0.0-20211025104526-d4affc2eba6d/go.mod h1:5WKePD4Y8lsPoD5xQy887gFC97EC6vNbJVBcbva/8ws=\ngithub.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=\ngithub.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=\ngithub.com/golang-migrate/migrate/v4 v4.11.0/go.mod h1:nqbpDbckcYjsCD5I8q5+NI9Tkk7SVcmaF40Ax1eAWhg=\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
chore: build controller-gen and stringer in temp dir (#817)
Build the controller-gen and stringer in temp dir to avoid the version of harbor pkg always changing in github actions.
Signed-off-by: He Weiwei <hweiwei@vmware.com>
|
254,889
|
15.11.2021 13:24:27
| 0
|
f61ba2167bed2d1e8b41afa012e538b0c7a8bc47
|
fix: Allow for empty S3 SecretKeyRef
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/registry/deployments.go",
"new_path": "controllers/goharbor/registry/deployments.go",
"diff": "@@ -464,6 +464,7 @@ func (r *Reconciler) ApplyFilesystemStorageEnvs(ctx context.Context, registry *g\nfunc (r *Reconciler) ApplyS3StorageEnvs(ctx context.Context, registry *goharborv1.Registry, deploy *appsv1.Deployment) error {\nregContainer := &deploy.Spec.Template.Spec.Containers[registryContainerIndex]\n+ if registry.Spec.Storage.Driver.S3.SecretKeyRef != \"\" {\nregContainer.Env = append(regContainer.Env, corev1.EnvVar{\nName: \"REGISTRY_STORAGE_S3_SECRETKEY\",\nValueFrom: &corev1.EnvVarSource{\n@@ -475,6 +476,7 @@ func (r *Reconciler) ApplyS3StorageEnvs(ctx context.Context, registry *goharborv\n},\n},\n})\n+ }\nreturn nil\n}\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix: Allow for empty S3 SecretKeyRef
Signed-off-by: David Griffiths <dave.griffiths@sainsburys.co.uk>
|
254,865
|
23.11.2021 19:25:35
| -28,800
|
c4208eb8177e22f58c926e6d3ffb8d4a13a00ab3
|
fix(expose): remove generate code
|
[
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"new_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"diff": "-//go:build !ignore_autogenerated\n// +build !ignore_autogenerated\n// Code generated by controller-gen. DO NOT EDIT.\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/meta/v1alpha1/zz_generated.deepcopy.go",
"new_path": "apis/meta/v1alpha1/zz_generated.deepcopy.go",
"diff": "-//go:build !ignore_autogenerated\n// +build !ignore_autogenerated\n// Code generated by controller-gen. DO NOT EDIT.\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix(expose): remove generate code
|
254,865
|
07.12.2021 11:20:20
| -28,800
|
afac1eff8461b25f03e5fcbb97e3a461c6805c36
|
fix(expose): fix go-lint
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/ingresses.go",
"new_path": "controllers/goharbor/harbor/ingresses.go",
"diff": "@@ -32,7 +32,6 @@ func (r *Reconciler) AddCoreIngress(ctx context.Context, harbor *goharborv1.Harb\n}\nfunc (r *Reconciler) GetCoreIngress(ctx context.Context, harbor *goharborv1.Harbor) (*netv1.Ingress, error) {\n-\nvar tls []netv1.IngressTLS\nif harbor.Spec.Expose.Core.TLS.Enabled() {\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor_test.go",
"new_path": "controllers/goharbor/harbor_test.go",
"diff": "@@ -150,7 +150,7 @@ func setupValidHarbor(ctx context.Context, ns string) (Resource, client.ObjectKe\nExpose: goharborv1.HarborExposeSpec{\nCore: goharborv1.HarborExposeComponentSpec{\nTLS: nil,\n- Ingress: &goharborv1.HarborExposeIngressSpec{\n+ Ingress: goharborv1.HarborExposeIngressSpec{\nHost: \"core.goharbor.io\",\n},\n},\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix(expose): fix go-lint
Signed-off-by: wangcanfeng <wangcanfeng@corp.netease.com>
|
254,865
|
07.12.2021 14:05:54
| -28,800
|
29d71db0d47fee2695ae99bc0821ea706c97d996
|
fix zz_generated.deepcopy.go
|
[
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1alpha3/zz_generated.deepcopy.go",
"new_path": "apis/goharbor.io/v1alpha3/zz_generated.deepcopy.go",
"diff": "-//go:build !ignore_autogenerated\n// +build !ignore_autogenerated\n// Code generated by controller-gen. DO NOT EDIT.\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"new_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"diff": "-//go:build !ignore_autogenerated\n// +build !ignore_autogenerated\n// Code generated by controller-gen. DO NOT EDIT.\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/meta/v1alpha1/zz_generated.deepcopy.go",
"new_path": "apis/meta/v1alpha1/zz_generated.deepcopy.go",
"diff": "-//go:build !ignore_autogenerated\n// +build !ignore_autogenerated\n// Code generated by controller-gen. DO NOT EDIT.\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix zz_generated.deepcopy.go
|
254,862
|
03.01.2022 21:39:51
| 28,800
|
e4f467abd8e288803ab001140bd7b42a4607650f
|
Fix readme
ServerURL must begin with http or https
|
[
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/harborserverconfiguration_types.go",
"new_path": "apis/goharbor.io/v1beta1/harborserverconfiguration_types.go",
"diff": "@@ -13,7 +13,7 @@ type HarborServerConfigurationSpec struct {\n// Important: Run \"make\" to regenerate code after modifying this file\n// +kubebuilder:validation:Required\n- // +kubebuilder:validation:Pattern=\"(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\\\-]*[A-Za-z0-9])\"\n+ // +kubebuilder:validation:Pattern=\"(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^https?://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\\\-]*[A-Za-z0-9])\"\nServerURL string `json:\"serverURL\"`\n// Indicate if the Harbor server is an insecure registry\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/templates/crds.yaml",
"new_path": "charts/harbor-operator/templates/crds.yaml",
"diff": "@@ -12156,7 +12156,7 @@ spec:\ntype: string\ntype: array\nserverURL:\n- pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\n+ pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^https?://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\ntype: string\nversion:\ndescription: The version of the Harbor server\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/configurations/day2-config.md",
"new_path": "docs/configurations/day2-config.md",
"diff": "@@ -32,7 +32,7 @@ host and access key & secret (key and secret should be wrapped into a kubernetes\nIt has a `default` field to define whether this HSC will be applied to all namespaces. There could be only one default HSC.\nRewriting rule is a k-v pair to specify images from which repo should be redirected to which harbor project:\n-`\"docker.io\": \"harborproject1\"` or `\"*\": \"harborproject2\"`\n+`docker.io=>harborproject1` or `*=>harborproject2`\nHere we should pay attention is the key \"*\" means images from any repo are redirected to harbor project \"harborproject2\".\n@@ -40,9 +40,9 @@ Rewriting rules will be defined as a rule list like:\n```shell\nrules:\n- - docker.io:harborproject1\n- - *:harborproject2\n- - quay.io:harborproject3\n+ - docker.io=>harborproject1\n+ - *=>harborproject2\n+ - quay.io=>harborproject3\n```\n**Definition location:**\n@@ -76,9 +76,9 @@ Namespace admin can create a configMap to customize image rewriting for the spec\nhsc: myHscName ## if this ns missing the selector of the specfying HSC, log warnning and no action.\nrewriting: on ## or off\nrules: -|\n- - docker.io:harborproject1-1\n- - *:harborproject2-1\n- - quay.io:harborproject3-1\n+ - docker.io=>harborproject1-1\n+ - *=>harborproject2-1\n+ - quay.io=>harborproject3-1\n```\nAdd annotation `goharbor.io/rewriting-rules=configMapName` to the namespace to enable the rewriting.\n@@ -143,6 +143,7 @@ kustomize build config/default | kubectl delete -f -\nRegister your Harbor in a `HarborServerConfiguration` CR:\n```yaml\n+---\napiVersion: v1\nkind: Secret\nmetadata:\n@@ -153,23 +154,18 @@ data:\naccessKey: YWRtaW4=\naccessSecret: SGFyYm9yMTIzNDU=\n---\n-apiVersion: goharbor.io/v1alpha1\n+apiVersion: goharbor.io/v1beta1\nkind: HarborServerConfiguration\nmetadata:\nname: harborserverconfiguration-sample\nspec:\ndefault: true ## whether it will be default global hsc\n- serverURL: 10.168.167.189\n+ serverURL: https://10.168.167.189 ## https/http is required\naccessCredential:\nnamespace: kube-system\naccessSecretRef: mysecret\n- version: 2.1.0\n+ version: 2.4.0\ninsecure: true\n- rules: ## rules to define to rewrite image path\n- - \"docker.io,myharbor\" ## <repo-regex>,<harbor-project>\n- namespaceSelector:\n- matchLabels:\n- usethisHSC: true\n```\nCreate it:\n@@ -186,7 +182,7 @@ kubectl get hsc\n### Pulling secret injection\n-Add related annotations to your namespace when enabling secret injection:\n+Add related annotations and labels to your namespace when enabling secret injection:\n```yaml\napiVersion: v1\n@@ -197,8 +193,6 @@ metadata:\ngoharbor.io/harbor: harborserverconfiguration-sample\ngoharbor.io/service-account: default\ngoharbor.io/project: \"*\"\n- label:\n- harbor-day2-webhook-configuration: enabled\n```\nCreate it:\n@@ -207,7 +201,47 @@ Create it:\nkubectl apply -f namespace.yaml\n```\n-After the automation is completed, a CR `PullSecretBinding` is created:\n+After the automation is completed, Namespace is updated with newest annotations, a CR `PullSecretBinding` is created:\n+\n+```shell script\n+kubectl get namespace sz-namespace1 -oyaml\n+```\n+\n+Output details:\n+\n+```yaml\n+apiVersion: v1\n+kind: Namespace\n+metadata:\n+ annotations:\n+ goharbor.io/harbor: harborserverconfiguration-sample\n+ goharbor.io/project: sz-namespace1-y87uip\n+ goharbor.io/robot: \"8\"\n+ goharbor.io/service-account: default\n+ kubectl.kubernetes.io/last-applied-configuration: |\n+ {\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"annotations\":{\"goharbor.io/harbor\":\"harborserverconfiguration-sample\",\"goharbor.io/project\":\"*\",\"goharbor.io/service-account\":\"default\"},\"labels\":{\"harbor-day2-webhook-configuration\":\"enabled\",\"usethisHSC\":\"ok\"},\"name\":\"sz-namespace1\"}}\n+ creationTimestamp: \"2021-12-22T21:17:38Z\"\n+ labels:\n+ harbor-day2-webhook-configuration: enabled\n+ kubernetes.io/metadata.name: sz-namespace1\n+ usethisHSC: ok\n+ name: sz-namespace1\n+ resourceVersion: \"8102\"\n+ uid: 43bd7365-792f-4523-a749-57ea19ace40f\n+spec:\n+ finalizers:\n+ - kubernetes\n+status:\n+ phase: Active\n+```\n+\n+The related auto-generated data is recorded in the related annotations:\n+\n+```yaml\n+annotations:\n+ goharbor.io/project: sz-namespace1-y87uip\n+ goharbor.io/robot: \"8\"\n+```\n```shell script\nkubectl get psb -n sz-namespace1\n@@ -226,18 +260,16 @@ k8s get psb/binding-txushc -n sz-namespace1 -o yaml\nOutput details:\n```yaml\n-apiVersion: goharbor.io/v1alpha1\n+apiVersion: goharbor.io/v1beta1\nkind: PullSecretBinding\nmetadata:\nannotations:\n- goharbor.io/project: sz-namespace1-axtnd8\n- goharbor.io/robot: \"31\"\n- goharbor.io/robot-secret: regsecret-sab3pq\n- creationTimestamp: \"2020-12-02T15:21:48Z\"\n+ goharbor.io/robot-secret: regsecret-dhrdxd\n+ creationTimestamp: \"2021-12-22T21:33:35Z\"\nfinalizers:\n- psb.finalizers.resource.goharbor.io\ngeneration: 1\n- name: binding-txushc\n+ name: binding-fqgysg\nnamespace: sz-namespace1\nownerReferences:\n- apiVersion: v1\n@@ -245,15 +277,15 @@ metadata:\ncontroller: true\nkind: Namespace\nname: sz-namespace1\n- uid: 810efadd-b560-4791-8007-8decaf2fbb1c\n- resourceVersion: \"2500851\"\n- selfLink: /apis/goharbor.io/v1alpha1/namespaces/sz-namespace1/pullsecretbindings/binding-txushc\n- uid: f5b4f68a-4657-4f89-b231-0fc96c03ca00\n+ uid: 43bd7365-792f-4523-a749-57ea19ace40f\n+ resourceVersion: \"8107\"\n+ uid: c52f5b10-1cbd-49f6-9731-78e5d3f8dfdb\nspec:\nharborServerConfig: harborserverconfiguration-sample\n+ projectId: \"30\"\n+ robotId: \"8\"\nserviceAccount: default\nstatus:\n- conditions: []\nstatus: ready\n```\n@@ -261,14 +293,16 @@ The related auto-generated data is recorded in the related annotations:\n```yaml\nannotations:\n- goharbor.io/project: sz-namespace1-axtnd8\n- goharbor.io/robot: \"31\"\n- goharbor.io/robot-secret: regsecret-sab3pq\n+ goharbor.io/robot-secret: regsecret-dhrdxd\n```\n### Image path rewrite\n-To enable image rewrite, set the rules section in hsc, or set annotation to refer to a configMap that contains rules and hsc\n+Add `goharbor.io/rewriting-rules` annotation to target namespace, the value would be the name of ConfigMap that contains the rule. The configMap should be in the same namespace.\n+\n+Add label `harbor-day2-webhook-configuration: enabled` to the target namespace as well.\n+\n+If you set namespaceSelector, also add corresponding label to namespace.\n```yaml\napiVersion: v1\n@@ -279,9 +313,14 @@ metadata:\ngoharbor.io/harbor: harborserverconfiguration-sample\ngoharbor.io/service-account: default\ngoharbor.io/rewriting-rules: cm\n+ labels:\n+ usethisHSC: ok\n+ harbor-day2-webhook-configuration: enabled\n```\n-Corresponding ConfigMap\n+Rules can be set in ConfigMap, or in the HSC that is referred in `configmap.data.hsc`. `configmap.data.rewriting` needs to be `on`.\n+\n+Corresponding ConfigMap:\n```yaml\napiVersion: v1\n@@ -290,34 +329,63 @@ metadata:\nname: cm\nnamespace: sz-namespace1\ndata:\n- hsc: harbor2\n- rewriting: \"on\"\n+ hsc: harbor2 # hsc that could store the rule\n+ rewriting: \"on\" # set to \"on\" to turn on the rewriting\nrules: | # configMap doesn't support storing nested string\n- docker.io,highestproject\n- gcr.io,a\n-\n+ - docker.io=>highestproject\n+ - gcr.io=>a\n```\nCorresponding HSC\n+To only select specific namespace for apply rules under specific HSC, add `namespaceSelector` to target HSC spec.\n+\n```yaml\n-apiVersion: goharbor.io/v1alpha1\n+apiVersion: goharbor.io/v1beta1\nkind: HarborServerConfiguration\nmetadata:\n- name: harborserverconfiguration-sample\n+ name: harbor2\nspec:\n- serverURL: 10.168.167.12\n+ serverURL: https://10.168.167.189 ## https/http is required\naccessCredential:\nnamespace: kube-system\naccessSecretRef: mysecret\n- version: 2.1.0\n+ version: 2.4.0\ninsecure: true\nrules: ## rules to define to rewrite image path\n- - \"docker.io,testharbor\" ## <repo-regex>,<harbor-project>\n-\n+ - \"docker.io=>testharbor\" ## <repo-regex>,<harbor-project>\n+ namespaceSelector:\n+ matchLabels:\n+ usethisHSC: ok\n```\nAs mentioned before, the mutating webhook will rewrite all the images of the deploying pods which has no registry host\nprefix to the flowing pattern:\n`image:tag => <hsc/hsc-name.[spec.serverURL]>/<psb/binding-xxx.[metadata.annotations[goharbor.io/project]]>/image:tag`\n+\n+And priority of the rule is\n+\n+> Rules in configMap > rules in HSC referenced by ConfigMap > default HSC > \"*\" rule\n+\n+Try create a pod under namespace `sz-namespace1`\n+\n+```yaml\n+apiVersion: v1\n+kind: Pod\n+metadata:\n+ name: webserver\n+ namespace: sz-namespace1\n+spec:\n+ containers:\n+ - name: webserver # The name that this container will have.\n+ image: nginx:latest # The image on which it is based.\n+ ports: # The port(s) that will be open.\n+ - containerPort: 80\n+```\n+\n+The pod image path should be changed\n+\n+```yaml\n+Image: demo.goharbor.io/highestproject/library/nginx:latest\n+```\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -12182,7 +12182,7 @@ spec:\ntype: string\ntype: array\nserverURL:\n- pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\n+ pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^https?://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\ntype: string\nversion:\ndescription: The version of the Harbor server\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/deployment.yaml",
"new_path": "manifests/harbor/deployment.yaml",
"diff": "@@ -12182,7 +12182,7 @@ spec:\ntype: string\ntype: array\nserverURL:\n- pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\n+ pattern: (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^https?://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])\ntype: string\nversion:\ndescription: The version of the Harbor server\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/rule/rule.go",
"new_path": "pkg/rule/rule.go",
"diff": "package rule\n-import \"strings\"\n+import (\n+ \"net/url\"\n+ \"strings\"\n+\n+ \"github.com/pkg/errors\"\n+)\ntype Rule struct {\nRegistryRegex string\n@@ -8,26 +13,44 @@ type Rule struct {\nServerURL string\n}\n-// assume rule.Rules are concatentated by ','.\n-func StringToRules(raw []string, server string) []Rule {\n+// StringToRules parse rule and create Rule object\n+// assume rule.Rules are concatentated by '=>'.\n+func StringToRules(raw []string, server string) ([]Rule, error) {\nres := make([]Rule, 0)\n+ // remove https/http from the serverURL\n+ u, err := url.Parse(server)\n+ if err != nil {\n+ return nil, err\n+ }\n+\nfor _, r := range raw {\n- registryRegex := r[:strings.LastIndex(r, \",\")]\n- project := r[strings.LastIndex(r, \",\")+1:]\n+ // format read from configMap could be like '- docker.io=>value'\n+ if r == \"\" || !strings.Contains(r, \"=>\") {\n+ return nil, errors.Errorf(\"rule '%s' is invalid\", r)\n+ }\n+\n+ if len(r) >= 2 && r[0:2] == \"- \" {\n+ r = r[2:]\n+ }\n+\n+ lastIndex := strings.LastIndex(r, \"=\")\n+ registryRegex := r[:lastIndex]\n+ project := r[lastIndex+2:]\nres = append(res, Rule{\nRegistryRegex: registryRegex,\nProject: project,\n- ServerURL: server,\n+ ServerURL: u.Host,\n})\n}\n- return res\n+ return res, nil\n}\n-// append l after h, so l will be checked first.\n-// there could be cases that regex in h is `gcr.io`, while in l is `gcr.io*`.\n-func MergeRules(l, h []Rule) []Rule {\n+// MergeRules appends rule l after h, so h will be checked first.\n+// we append instead of merge since rules are regex, hard to merge,\n+// for example 'google.com' and '$google.com^' are the same.\n+func MergeRules(h, l []Rule) []Rule {\nreturn append(h, l...)\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/rule/rule_test.go",
"diff": "+package rule_test\n+\n+import (\n+ \"testing\"\n+\n+ \"github.com/goharbor/harbor-operator/pkg/rule\"\n+ \"github.com/stretchr/testify/require\"\n+)\n+\n+var (\n+ testURL = \"ww.test.com\"\n+ rawURL = \"https://ww.test.com\"\n+)\n+\n+func Test_StringToRules(t *testing.T) {\n+ type testcase struct {\n+ description string\n+ rules []string\n+ expectedRules []rule.Rule\n+ }\n+\n+ tests := []testcase{\n+ {\n+ description: \"rules from hsc\",\n+ rules: []string{\"docker.io=>harborproject1\", \"*=>harborproject2\", \"quay.io=>harborproject3\"},\n+ expectedRules: []rule.Rule{\n+ {\n+ RegistryRegex: \"docker.io\",\n+ Project: \"harborproject1\",\n+ ServerURL: testURL,\n+ },\n+ {\n+ RegistryRegex: \"*\",\n+ Project: \"harborproject2\",\n+ ServerURL: testURL,\n+ },\n+ {\n+ RegistryRegex: \"quay.io\",\n+ Project: \"harborproject3\",\n+ ServerURL: testURL,\n+ },\n+ },\n+ },\n+ {\n+ description: \"rules from configMap\",\n+ rules: []string{\"- docker.io=>harborproject1\", \"- *=>harborproject2\", \"- quay.io=>harborproject3\"},\n+ expectedRules: []rule.Rule{\n+ {\n+ RegistryRegex: \"docker.io\",\n+ Project: \"harborproject1\",\n+ ServerURL: testURL,\n+ },\n+ {\n+ RegistryRegex: \"*\",\n+ Project: \"harborproject2\",\n+ ServerURL: testURL,\n+ },\n+ {\n+ RegistryRegex: \"quay.io\",\n+ Project: \"harborproject3\",\n+ ServerURL: testURL,\n+ },\n+ },\n+ },\n+ }\n+\n+ for _, tc := range tests {\n+ output, err := rule.StringToRules(tc.rules, rawURL)\n+ require.Nil(t, err)\n+ require.Equal(t, tc.expectedRules, output, tc.description)\n+ }\n+}\n+\n+func Test_MergeRules(t *testing.T) {\n+ type testcase struct {\n+ description string\n+ rules1 []rule.Rule\n+ rules2 []rule.Rule\n+ expectedRules []rule.Rule\n+ }\n+\n+ tests := []testcase{\n+ {\n+ description: \"rules from hsc\",\n+ rules1: []rule.Rule{\n+ {\n+ RegistryRegex: \"docker.io\",\n+ Project: \"harborproject1\",\n+ ServerURL: testURL,\n+ },\n+ },\n+ rules2: []rule.Rule{\n+ {\n+ RegistryRegex: \"quay.io\",\n+ Project: \"harborproject3\",\n+ ServerURL: testURL,\n+ },\n+ },\n+ expectedRules: []rule.Rule{\n+ {\n+ RegistryRegex: \"docker.io\",\n+ Project: \"harborproject1\",\n+ ServerURL: testURL,\n+ },\n+ {\n+ RegistryRegex: \"quay.io\",\n+ Project: \"harborproject3\",\n+ ServerURL: testURL,\n+ },\n+ },\n+ },\n+ }\n+\n+ for _, tc := range tests {\n+ output := rule.MergeRules(tc.rules1, tc.rules2)\n+\n+ require.Equal(t, tc.expectedRules, output, tc.description)\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "webhooks/pod/mutate_image_path.go",
"new_path": "webhooks/pod/mutate_image_path.go",
"diff": "@@ -88,8 +88,17 @@ func (ipr *ImagePathRewriter) Handle(ctx context.Context, req admission.Request)\n}\n// append rules of configMap to rules of hsc.\n- allRules = rule.MergeRules(rule.StringToRules(hsc.Spec.Rules, hsc.Spec.ServerURL),\n- rule.StringToRules(strings.Split(strings.TrimSpace(cm.Data[consts.ConfigMapKeyRules]), \"\\n\"), hsc.Spec.ServerURL))\n+ rulesFromHSC, err := rule.StringToRules(hsc.Spec.Rules, hsc.Spec.ServerURL)\n+ if err != nil {\n+ return admission.Errored(http.StatusInternalServerError, fmt.Errorf(\"failed to parse rule, error: %w\", err))\n+ }\n+\n+ rulesFromConfigMap, err := rule.StringToRules(strings.Split(strings.TrimSpace(cm.Data[consts.ConfigMapKeyRules]), \"\\n\"), hsc.Spec.ServerURL)\n+ if err != nil {\n+ return admission.Errored(http.StatusInternalServerError, fmt.Errorf(\"failed to parse rule, error: %w\", err))\n+ }\n+\n+ allRules = rule.MergeRules(rulesFromConfigMap, rulesFromHSC)\n} else if _, yes := cm.Data[consts.ConfigMapKeyRules]; yes && strings.TrimSpace(cm.Data[consts.ConfigMapKeyRules]) != \"\" {\nreturn admission.Errored(http.StatusBadRequest, errors.New(\"rule are defined in configMap but there is no hsc associated with it\"))\n}\n@@ -103,7 +112,12 @@ func (ipr *ImagePathRewriter) Handle(ctx context.Context, req admission.Request)\nif defaultHSC != nil && defaultHSC.Spec.NamespaceSelector != nil {\n// check selector, if there is match, add the default rule to it. it has lowerest priority\nif match := checkNamespaceSelector(podNS.Labels, defaultHSC.Spec.NamespaceSelector.MatchLabels); match {\n- allRules = rule.MergeRules(rule.StringToRules(defaultHSC.Spec.Rules, defaultHSC.Spec.ServerURL), allRules)\n+ ruleFromDefaultHSC, err := rule.StringToRules(defaultHSC.Spec.Rules, defaultHSC.Spec.ServerURL)\n+ if err != nil {\n+ return admission.Errored(http.StatusInternalServerError, fmt.Errorf(\"failed to parse rule, error: %w\", err))\n+ }\n+\n+ allRules = rule.MergeRules(allRules, ruleFromDefaultHSC)\n} else {\n// it's ok to not match the default hsc\nipr.Log.Info(\"default hsc \", defaultHSC.Namespace, \"/\", defaultHSC.Name, \" doesn't match current namespace\")\n@@ -138,7 +152,7 @@ func (ipr *ImagePathRewriter) getConfigMap(ctx context.Context, name, namespace\nNamespace: namespace,\nName: name,\n}\n- // TODO: replace with no cache client to avoid potential OOM issue\n+\nif err := ipr.Client.Get(ctx, cmNamespacedName, cm); err != nil {\nreturn nil, err\n}\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
Fix readme (#831)
ServerURL must begin with http or https
Signed-off-by: lubronzhan <lzhan@vmware.com>
|
254,875
|
06.01.2022 23:32:34
| -28,800
|
90b16b1e81faa46b335845aa745c79d8cf949f29
|
update monitor logs
|
[
{
"change_type": "MODIFY",
"old_path": "docs/LCM/monitor-logs-with-grafana.md",
"new_path": "docs/LCM/monitor-logs-with-grafana.md",
"diff": "# Monitor logs with grafana\n-TBD\n+Quickly setup the grafana+loki+fluentbit for harbor logs in KIND k8s\n+- change the host `grafana.harbor.domain` and grafana password `Admin123` below\n+```\n+kubectl apply -f - <<EOF\n+---\n+apiVersion: v1\n+kind: Namespace\n+metadata:\n+ name: logging\n+---\n+apiVersion: v1\n+kind: ConfigMap\n+metadata:\n+ name: loki-config\n+ namespace: logging\n+ labels:\n+ k8s-app: loki\n+data:\n+ # Configuration files: server, input, filters and output\n+ # ======================================================\n+ loki-config.yaml: |\n+ auth_enabled: false\n+\n+ server:\n+ http_listen_port: 3100\n+\n+ ingester:\n+ lifecycler:\n+ address: 127.0.0.1\n+ ring:\n+ kvstore:\n+ store: inmemory\n+ replication_factor: 1\n+ final_sleep: 0s\n+ chunk_idle_period: 1h # Any chunk not receiving new logs in this time will be flushed\n+ max_chunk_age: 1h # All chunks will be flushed when they hit this age, default is 1h\n+ chunk_target_size: 1048576 # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first\n+ chunk_retain_period: 30s # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m)\n+ max_transfer_retries: 0 # Chunk transfers disabled\n+\n+ schema_config:\n+ configs:\n+ - from: 2020-10-24\n+ store: boltdb-shipper\n+ object_store: filesystem\n+ schema: v11\n+ index:\n+ prefix: index_\n+ period: 24h\n+\n+ storage_config:\n+ boltdb_shipper:\n+ active_index_directory: /tmp/loki/boltdb-shipper-active\n+ cache_location: /tmp/loki/boltdb-shipper-cache\n+ cache_ttl: 24h # Can be increased for faster performance over longer query periods, uses more disk space\n+ shared_store: filesystem\n+ filesystem:\n+ directory: /tmp/loki/chunks\n+\n+ compactor:\n+ working_directory: /tmp/loki/boltdb-shipper-compactor\n+ shared_store: filesystem\n+\n+ limits_config:\n+ reject_old_samples: true\n+ reject_old_samples_max_age: 168h\n+\n+ chunk_store_config:\n+ max_look_back_period: 0s\n+\n+ table_manager:\n+ retention_deletes_enabled: false\n+ retention_period: 0s\n+\n+ ruler:\n+ storage:\n+ type: local\n+ local:\n+ directory: /tmp/loki/rules\n+ rule_path: /tmp/loki/rules-temp\n+ alertmanager_url: http://localhost:9093\n+ ring:\n+ kvstore:\n+ store: inmemory\n+ enable_api: true\n+---\n+apiVersion: v1\n+kind: Pod\n+metadata:\n+ name: loki\n+ namespace: logging\n+ labels:\n+ k8s-app: loki\n+spec:\n+ containers:\n+ - name: loki\n+ image: ap.cicd.harbor.vmwarecna.net/proxy/grafana/loki:2.1.0\n+ imagePullPolicy: IfNotPresent\n+ command:\n+ - /usr/bin/loki\n+ - \"-config.file=/loki-config/loki-config.yaml\"\n+ ports:\n+ - containerPort: 3100\n+ name: loki\n+ protocol: TCP\n+ volumeMounts:\n+ - name: loki-config\n+ mountPath: /loki-config/\n+ volumes:\n+ - name: loki-config\n+ configMap:\n+ name: loki-config\n+---\n+apiVersion: v1\n+kind: Service\n+metadata:\n+ name: loki\n+ namespace: logging\n+spec:\n+ ports:\n+ - name: loki\n+ port: 3100\n+ protocol: TCP\n+ targetPort: loki\n+ selector:\n+ k8s-app: loki\n+---\n+apiVersion: v1\n+kind: Pod\n+metadata:\n+ name: grafana\n+ namespace: logging\n+ labels:\n+ k8s-app: grafana\n+spec:\n+ containers:\n+ - name: grafana\n+ image: ap.cicd.harbor.vmwarecna.net/proxy/grafana/grafana\n+ imagePullPolicy: IfNotPresent\n+ env:\n+ - name: GF_SECURITY_ADMIN_PASSWORD\n+ value: Admin123\n+ ports:\n+ - containerPort: 3000\n+ name: grafana\n+ protocol: TCP\n+---\n+apiVersion: v1\n+kind: Service\n+metadata:\n+ name: grafana\n+ namespace: logging\n+spec:\n+ ports:\n+ - name: grafana\n+ port: 3000\n+ protocol: TCP\n+ targetPort: grafana\n+ selector:\n+ k8s-app: grafana\n+---\n+apiVersion: v1\n+kind: ServiceAccount\n+metadata:\n+ name: fluent-bit\n+ namespace: logging\n+---\n+apiVersion: rbac.authorization.k8s.io/v1beta1\n+kind: ClusterRole\n+metadata:\n+ name: fluent-bit-read\n+rules:\n+- apiGroups: [\"\"]\n+ resources:\n+ - namespaces\n+ - pods\n+ verbs: [\"get\", \"list\", \"watch\"]\n+---\n+apiVersion: rbac.authorization.k8s.io/v1beta1\n+kind: ClusterRoleBinding\n+metadata:\n+ name: fluent-bit-read\n+roleRef:\n+ apiGroup: rbac.authorization.k8s.io\n+ kind: ClusterRole\n+ name: fluent-bit-read\n+subjects:\n+- kind: ServiceAccount\n+ name: fluent-bit\n+ namespace: logging\n+---\n+apiVersion: v1\n+kind: ConfigMap\n+metadata:\n+ name: fluent-bit-config\n+ namespace: logging\n+ labels:\n+ k8s-app: fluent-bit\n+data:\n+ # Configuration files: server, input, filters and output\n+ # ======================================================\n+ fluent-bit.conf: |\n+ [SERVICE]\n+ Flush 1\n+ Log_Level info\n+ Daemon off\n+ Parsers_File parsers.conf\n+ HTTP_Server On\n+ HTTP_Listen 0.0.0.0\n+ HTTP_Port 2020\n+ @INCLUDE input-kubernetes.conf\n+ @INCLUDE filter-kubernetes.conf\n+ @INCLUDE output-loki.conf\n+ input-kubernetes.conf: |\n+ [INPUT]\n+ Name tail\n+ Tag kube.*\n+ Path /var/log/containers/harbor*.log\n+ Parser kind\n+ DB /var/log/flb_kube.db\n+ Mem_Buf_Limit 5MB\n+ Skip_Long_Lines On\n+ Refresh_Interval 10\n+ filter-kubernetes.conf: |\n+ [FILTER]\n+ Name kubernetes\n+ Match kube.*\n+ Kube_URL https://kubernetes.default.svc:443\n+ Kube_CA_File /var/run/secrets/kubernetes.io/serviceaccount/ca.crt\n+ Kube_Token_File /var/run/secrets/kubernetes.io/serviceaccount/token\n+ Kube_Tag_Prefix kube.var.log.containers.\n+ Merge_Log On\n+ Merge_Log_Key log_processed\n+ K8S-Logging.Parser On\n+ K8S-Logging.Exclude Off\n+ output-syslog.conf: |\n+ [OUTPUT]\n+ Name syslog\n+ Match *\n+ Host \\${LOG_HOST}\n+ Port \\${LOG_PORT}\n+ Mode udp\n+ Syslog_Message_Key message\n+ [OUTPUT]\n+ Name stdout\n+ Match *\n+ output-loki.conf: |\n+ [OUTPUT]\n+ Name loki\n+ Match *\n+ Host \\${LOG_HOST}\n+ Port \\${LOG_PORT}\n+ auto_kubernetes_labels on\n+ label_keys \\$kubernetes['pod_name'],\\$kubernetes['container_name'],\\$kubernetes['namespace_name'],\\$kubernetes['host']\n+ [OUTPUT]\n+ Name stdout\n+ Match *\n+ parsers.conf: |\n+ [PARSER]\n+ Name apache\n+ Format regex\n+ Regex ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \\[(?<time>[^\\]]*)\\] \"(?<method>\\S+)(?: +(?<path>[^\\\"]*?)(?: +\\S*)?)?\" (?<code>[^ ]*) (?<size>[^ ]*)(?: \"(?<referer>[^\\\"]*)\" \"(?<agent>[^\\\"]*)\")?$\n+ Time_Key time\n+ Time_Format %d/%b/%Y:%H:%M:%S %z\n+ [PARSER]\n+ Name apache2\n+ Format regex\n+ Regex ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \\[(?<time>[^\\]]*)\\] \"(?<method>\\S+)(?: +(?<path>[^ ]*) +\\S*)?\" (?<code>[^ ]*) (?<size>[^ ]*)(?: \"(?<referer>[^\\\"]*)\" \"(?<agent>[^\\\"]*)\")?$\n+ Time_Key time\n+ Time_Format %d/%b/%Y:%H:%M:%S %z\n+ [PARSER]\n+ Name apache_error\n+ Format regex\n+ Regex ^\\[[^ ]* (?<time>[^\\]]*)\\] \\[(?<level>[^\\]]*)\\](?: \\[pid (?<pid>[^\\]]*)\\])?( \\[client (?<client>[^\\]]*)\\])? (?<message>.*)$\n+ [PARSER]\n+ Name nginx\n+ Format regex\n+ Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \\[(?<time>[^\\]]*)\\] \"(?<method>\\S+)(?: +(?<path>[^\\\"]*?)(?: +\\S*)?)?\" (?<code>[^ ]*) (?<size>[^ ]*)(?: \"(?<referer>[^\\\"]*)\" \"(?<agent>[^\\\"]*)\")?$\n+ Time_Key time\n+ Time_Format %d/%b/%Y:%H:%M:%S %z\n+ [PARSER]\n+ Name json\n+ Format json\n+ Time_Key time\n+ Time_Format %d/%b/%Y:%H:%M:%S %z\n+ [PARSER]\n+ Name docker\n+ Format json\n+ Time_Key time\n+ Time_Format %Y-%m-%dT%H:%M:%S.%L\n+ Time_Keep On\n+ [PARSER]\n+ Name kind\n+ Format regex\n+ Regex ^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<message>.*)$\n+ Time_Key time\n+ Time_Format %Y-%m-%dT%H:%M:%S.%L\n+ Time_Keep On\n+ [PARSER]\n+ # http://rubular.com/r/tjUt3Awgg4\n+ Name cri\n+ Format regex\n+ Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<message>.*)$\n+ Time_Key time\n+ Time_Format %Y-%m-%dT%H:%M:%S.%L%z\n+ [PARSER]\n+ Name syslog\n+ Format regex\n+ Regex ^\\<(?<pri>[0-9]+)\\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\\/\\.\\-]*)(?:\\[(?<pid>[0-9]+)\\])?(?:[^\\:]*\\:)? *(?<message>.*)$\n+ Time_Key time\n+ Time_Format %b %d %H:%M:%S\n+---\n+apiVersion: apps/v1\n+kind: DaemonSet\n+metadata:\n+ name: fluent-bit\n+ namespace: logging\n+ labels:\n+ k8s-app: fluent-bit-logging\n+ version: v1\n+ kubernetes.io/cluster-service: \"true\"\n+spec:\n+ selector:\n+ matchLabels:\n+ k8s-app: fluent-bit-logging\n+ template:\n+ metadata:\n+ labels:\n+ k8s-app: fluent-bit-logging\n+ version: v1\n+ kubernetes.io/cluster-service: \"true\"\n+ annotations:\n+ prometheus.io/scrape: \"true\"\n+ prometheus.io/port: \"2020\"\n+ prometheus.io/path: /api/v1/metrics/prometheus\n+ spec:\n+ containers:\n+ - name: fluent-bit\n+ image: ap.cicd.harbor.vmwarecna.net/proxy/fluent/fluent-bit:1.6.10\n+ imagePullPolicy: IfNotPresent\n+ ports:\n+ - containerPort: 2020\n+ env:\n+ - name: LOG_HOST\n+ value: \"loki.logging.svc\"\n+ - name: LOG_PORT\n+ value: \"3100\"\n+ volumeMounts:\n+ - name: varlog\n+ mountPath: /var/log\n+ - name: varlibdockercontainers\n+ mountPath: /var/lib/docker/containers\n+ readOnly: true\n+ - name: fluent-bit-config\n+ mountPath: /fluent-bit/etc/\n+ terminationGracePeriodSeconds: 10\n+ volumes:\n+ - name: varlog\n+ hostPath:\n+ path: /var/log\n+ - name: varlibdockercontainers\n+ hostPath:\n+ path: /var/lib/docker/containers\n+ - name: fluent-bit-config\n+ configMap:\n+ name: fluent-bit-config\n+ serviceAccountName: fluent-bit\n+ tolerations:\n+ - key: node-role.kubernetes.io/master\n+ operator: Exists\n+ effect: NoSchedule\n+ - operator: \"Exists\"\n+ effect: \"NoExecute\"\n+ - operator: \"Exists\"\n+ effect: \"NoSchedule\"\n+---\n+apiVersion: extensions/v1beta1\n+kind: Ingress\n+metadata:\n+ name: grafana\n+ namespace: logging\n+spec:\n+ rules:\n+ - host: grafana.harbor.domain\n+ http:\n+ paths:\n+ - path: /\n+ backend:\n+ serviceName: grafana\n+ servicePort: 3000\n+EOF\n+```\n+\n+- you can use port-forward to access `http://grafana.harbor.domain` after set /etc/hosts\n+```\n+sudo kubectl port-forward svc/ingress-nginx-controller -n ingress-nginx --address 0.0.0.0 80:80 443:443\n+```\n+\n+- login and add datasource loki `http://loki.logging.svc:3100`\n+\n+- you can filter pod by label `kubernetes_container_name`\n+\n+- you can collect all other pods' logs by changing `/var/log/containers/*.log`\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
update monitor logs
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
10.01.2022 19:18:54
| -28,800
|
7069994694d5067a3a2751b60c75ed2e56801c9d
|
fix md lint
|
[
{
"change_type": "MODIFY",
"old_path": "docs/LCM/monitor-logs-with-grafana.md",
"new_path": "docs/LCM/monitor-logs-with-grafana.md",
"diff": "# Monitor logs with grafana\nQuickly setup the grafana+loki+fluentbit for harbor logs in KIND k8s\n+\n- change the host `grafana.harbor.domain` and grafana password `Admin123` below\n-```\n+\n+```bash\nkubectl apply -f - <<EOF\n---\napiVersion: v1\n@@ -394,7 +396,8 @@ EOF\n```\n- you can use port-forward to access `http://grafana.harbor.domain` after set /etc/hosts\n-```\n+\n+```bash\nsudo kubectl port-forward svc/ingress-nginx-controller -n ingress-nginx --address 0.0.0.0 80:80 443:443\n```\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix md lint
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,881
|
12.01.2022 15:07:44
| -28,800
|
35056b427665e9ee6331e7b3ddede8c26b86dbc5
|
fix: adjust the update logic of deprecated configmap day2 configuration
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/configuration/cm_reconciler.go",
"new_path": "controllers/goharbor/configuration/cm_reconciler.go",
"diff": "@@ -148,10 +148,17 @@ func (r *CmReconciler) createOrUpdateHarborConfiguration(ctx context.Context, hc\nif err != nil {\nif apierrors.IsNotFound(err) {\n// create hc\n+ r.Log.Info(\"Create HarborConfiguration\", \"hc\", hc)\n+\nreturn r.Client.Create(ctx, hc)\n}\n}\n- // hc exist\n- return r.Client.Update(ctx, hc)\n+ // if hc exist, update it\n+ new := old.DeepCopy()\n+ new.Spec = hc.Spec\n+\n+ r.Log.Info(\"Update HarborConfiguration\", \"hc\", new)\n+\n+ return r.Client.Update(ctx, new)\n}\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix: adjust the update logic of deprecated configmap day2 configuration (#835)
Signed-off-by: chlins <chenyuzh@vmware.com>
|
254,893
|
18.01.2022 18:05:42
| -28,800
|
d65f2758a54763e08b8ee1016747b7cb386160fc
|
doc(tutorial): update the out-of-date info
|
[
{
"change_type": "MODIFY",
"old_path": "docs/tutorial.md",
"new_path": "docs/tutorial.md",
"diff": "@@ -15,27 +15,28 @@ Before moving on, make sure the harbor operator is successfully deployed in the\n```shell\n~/harbor-operator$ kubectl get all -n harbor-operator-ns\nNAME READY STATUS RESTARTS AGE\n-pod/harbor-operator-6fd4dc66b-sh6cc 1/1 Running 0 3h18m\n-pod/minio-operator-667b56db9c-q6v4j 1/1 Running 0 3h18m\n-pod/postgres-operator-749db5dd66-phw98 1/1 Running 0 3h18m\n-pod/redisoperator-64dc645c84-9jlv6 1/1 Running 0 3h18m\n+pod/harbor-operator-85c94454bb-vm4mk 1/1 Running 0 6m12s\n+pod/minio-operator-67ddbdd4d8-v6qkl 1/1 Running 0 6m12s\n+pod/minio-operator-67ddbdd4d8-vqvrp 1/1 Running 0 6m12s\n+pod/postgres-operator-7dfbcfdf6b-wdgj4 1/1 Running 0 6m12s\n+pod/redisoperator-6f758c79fc-gk2cm 1/1 Running 0 6m12s\nNAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE\n-service/operator ClusterIP 10.96.202.139 <none> 4222/TCP,4233/TCP 3h18m\n-service/postgres-operator ClusterIP 10.96.193.93 <none> 8080/TCP 3h18m\n-service/webhook-service ClusterIP 10.96.251.203 <none> 443/TCP 3h18m\n+service/operator ClusterIP 10.96.141.225 <none> 4222/TCP 6m12s\n+service/postgres-operator ClusterIP 10.96.247.95 <none> 8080/TCP 6m12s\n+service/webhook-service ClusterIP 10.96.49.170 <none> 443/TCP 6m12s\nNAME READY UP-TO-DATE AVAILABLE AGE\n-deployment.apps/harbor-operator 1/1 1 1 3h18m\n-deployment.apps/minio-operator 1/1 1 1 3h18m\n-deployment.apps/postgres-operator 1/1 1 1 3h18m\n-deployment.apps/redisoperator 1/1 1 1 3h18m\n+deployment.apps/harbor-operator 1/1 1 1 6m12s\n+deployment.apps/minio-operator 2/2 2 2 6m12s\n+deployment.apps/postgres-operator 1/1 1 1 6m12s\n+deployment.apps/redisoperator 1/1 1 1 6m12s\nNAME DESIRED CURRENT READY AGE\n-replicaset.apps/harbor-operator-6fd4dc66b 1 1 1 3h18m\n-replicaset.apps/minio-operator-667b56db9c 1 1 1 3h18m\n-replicaset.apps/postgres-operator-749db5dd66 1 1 1 3h18m\n-replicaset.apps/redisoperator-64dc645c84 1 1 1 3h18m\n+replicaset.apps/harbor-operator-85c94454bb 1 1 1 6m12s\n+replicaset.apps/minio-operator-67ddbdd4d8 2 2 2 6m12s\n+replicaset.apps/postgres-operator-7dfbcfdf6b 1 1 1 6m12s\n+replicaset.apps/redisoperator-6f758c79fc 1 1 1 6m12s\n```\n## Deploy Harbor cluster\n@@ -236,7 +237,7 @@ The `name`, `public URL`, `status`, `operator version` and `operator commit` inf\n```log\nNAME PUBLIC URL STATUS OPERATOR VERSION OPERATOR GIT COMMIT\n-harborcluster-sample https://core.10.10.10.100.xip.io healthy 1.1.1 20072ed0511e59778f5325416314e41af8d76087\n+harborcluster-sample https://core.10.10.10.100.nip.io healthy 1.2.0 35056b427665e9ee6331e7b3ddede8c26b86dbc5\n```\nYou can check more detailed status(conditions) info of the deployed Harbor cluster with appending `-o yaml`.\n@@ -250,27 +251,33 @@ Some status info like the following data is printed out:\n```yaml\nstatus:\nconditions:\n- - lastTransitionTime: \"2021-09-28T07:40:45Z\"\n+ - lastTransitionTime: \"2022-01-18T10:02:02Z\"\nstatus: \"True\"\ntype: StorageReady\n- - lastTransitionTime: \"2021-09-28T07:40:45Z\"\n+ - lastTransitionTime: \"2022-01-18T10:00:55Z\"\nmessage: Harbor component database secrets are already create\nreason: Database is ready\nstatus: \"True\"\ntype: DatabaseReady\n- - lastTransitionTime: \"2021-09-28T07:23:55Z\"\n+ - lastTransitionTime: \"2022-01-18T10:00:27Z\"\nmessage: harbor component redis secrets are already create.\nreason: redis already ready\nstatus: \"True\"\ntype: CacheReady\n- - lastTransitionTime: \"2021-09-28T07:40:34Z\"\n- status: \"False\"\n+ - status: \"False\"\ntype: InProgress\n- - lastTransitionTime: \"2021-09-28T10:20:14Z\"\n+ - lastTransitionTime: \"2022-01-18T10:02:31Z\"\nstatus: \"True\"\ntype: ServiceReady\n- status: \"False\"\ntype: Failed\n+ observedGeneration: 1\n+ operator:\n+ controllerGitCommit: 35056b427665e9ee6331e7b3ddede8c26b86dbc5\n+ controllerName: harborcluster\n+ controllerVersion: dev_master\n+ revision: 1642500151584677122\n+ status: healthy\n```\nYou can also check what Kubernetes resources are created by getting all.\n@@ -282,77 +289,79 @@ kubectl get all -n cluster-sample-ns\nA few of resources info like the following data are output:\n```log\n-NAME READY STATUS RESTARTS AGEpod/harborcluster-sample-harbor-harbor-chartmuseum-5fcd966f47-6c2vb 1/1 Running 0 3h1m\n-pod/harborcluster-sample-harbor-harbor-core-74bb457c94-wmsjr 1/1 Running 0 3h1m\n-pod/harborcluster-sample-harbor-harbor-exporter-5dfb5c6f4-kbmtf 1/1 Running 0 3h17m\n-pod/harborcluster-sample-harbor-harbor-jobservice-58c8946c6c-bwg84 1/1 Running 0 3h17m\n-pod/harborcluster-sample-harbor-harbor-notaryserver-7dc7dc5f8dfnqkj 1/1 Running 0 3h1m\n-pod/harborcluster-sample-harbor-harbor-notarysigner-85459fbbb5rxsk5 1/1 Running 0 3h17m\n-pod/harborcluster-sample-harbor-harbor-portal-844cf56674-4c657 1/1 Running 0 3h17m\n-pod/harborcluster-sample-harbor-harbor-registry-89487bb8c-gkfn6 1/1 Running 0 21m\n-pod/harborcluster-sample-harbor-harbor-registryctl-7db9744d44-xl76b 1/1 Running 0 3h17m\n-pod/harborcluster-sample-harbor-harbor-trivy-5c795b8c77-ksdhk 1/1 Running 0 3h17m\n-pod/minio-harborcluster-sample-gn4qb 0/1 Completed 0 3h1m\n-pod/minio-harborcluster-sample-zone-harbor-0 1/1 Running 0 3h\n-pod/minio-harborcluster-sample-zone-harbor-1 1/1 Running 0 3h1m\n-pod/postgresql-cluster-sample-ns-harborcluster-sample-0 1/1 Running 0 3h18m\n-pod/rfr-harborcluster-sample-redis-0 1/1 Running 0 3h18m\n-pod/rfs-harborcluster-sample-redis-6fddf664-c7vj7 1/1 Running 0 3h18m\n+NAME READY STATUS RESTARTS AGE\n+pod/harborcluster-sample-harbor-harbor-chartmuseum-5b68bd46b8-lq9g9 1/1 Running 0 105s\n+pod/harborcluster-sample-harbor-harbor-core-7849f9c844-vf4w7 1/1 Running 0 105s\n+pod/harborcluster-sample-harbor-harbor-exporter-dd5c99bc9-br9sk 1/1 Running 0 98s\n+pod/harborcluster-sample-harbor-harbor-jobservice-668dd85cc4-2q9bf 1/1 Running 0 98s\n+pod/harborcluster-sample-harbor-harbor-notaryserver-77779bf8bf8t5tv 1/1 Running 0 108s\n+pod/harborcluster-sample-harbor-harbor-notarysigner-5c88dc99d8d5s64 1/1 Running 0 113s\n+pod/harborcluster-sample-harbor-harbor-portal-64465c4954-52zxc 1/1 Running 0 109s\n+pod/harborcluster-sample-harbor-harbor-registry-756dbcf5bb-zcrfn 2/2 Running 0 104s\n+pod/harborcluster-sample-harbor-harbor-trivy-599ff5c789-hcblv 1/1 Running 0 108s\n+pod/minio-harborcluster-sample--1-4n72x 0/1 Completed 0 117s\n+pod/minio-harborcluster-sample-zone-harbor-0 1/1 Running 0 3m23s\n+pod/minio-harborcluster-sample-zone-harbor-1 1/1 Running 0 3m23s\n+pod/postgresql-cluster-sample-ns-harborcluster-sample-0 1/1 Running 0 3m31s\n+pod/rfr-harborcluster-sample-redis-0 1/1 Running 0 3m31s\n+pod/rfs-harborcluster-sample-redis-6fddf664-9nwsc 1/1 Running 0 3m31s\nNAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE\n-service/harborcluster-sample-harbor-harbor-chartmuseum ClusterIP 10.96.180.44 <none> 443/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-core ClusterIP 10.96.147.11 <none> 443/TCP,8001/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-exporter ClusterIP 10.96.242.24 <none> 8001/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-jobservice ClusterIP 10.96.90.187 <none> 443/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-notaryserver ClusterIP 10.96.18.168 <none> 443/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-notarysigner ClusterIP 10.96.242.45 <none> 7899/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-portal ClusterIP 10.96.54.68 <none> 443/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-registry ClusterIP 10.96.249.140 <none> 443/TCP,8001/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-registryctl ClusterIP 10.96.44.32 <none> 443/TCP 3h17m\n-service/harborcluster-sample-harbor-harbor-trivy ClusterIP 10.96.231.198 <none> 443/TCP 3h17m\n-service/minio ClusterIP 10.96.74.160 <none> 80/TCP 3h17m\n-service/minio-harborcluster-sample-hl ClusterIP None <none> 9000/TCP 3h17m\n-service/postgresql-cluster-sample-ns-harborcluster-sample ClusterIP 10.96.75.26 <none> 5432/TCP 3h18m\n-service/postgresql-cluster-sample-ns-harborcluster-sample-config ClusterIP None <none> <none> 3h17m\n-service/postgresql-cluster-sample-ns-harborcluster-sample-repl ClusterIP 10.96.135.172 <none> 5432/TCP 3h18m\n-service/rfs-harborcluster-sample-redis ClusterIP 10.96.217.247 <none> 26379/TCP 3h18m\n+service/harborcluster-sample-harbor-harbor-chartmuseum ClusterIP 10.96.9.53 <none> 443/TCP 105s\n+service/harborcluster-sample-harbor-harbor-core ClusterIP 10.96.175.82 <none> 443/TCP,8001/TCP 106s\n+service/harborcluster-sample-harbor-harbor-exporter ClusterIP 10.96.1.77 <none> 8001/TCP 98s\n+service/harborcluster-sample-harbor-harbor-jobservice ClusterIP 10.96.67.178 <none> 443/TCP 98s\n+service/harborcluster-sample-harbor-harbor-notaryserver ClusterIP 10.96.235.154 <none> 443/TCP 108s\n+service/harborcluster-sample-harbor-harbor-notarysigner ClusterIP 10.96.246.138 <none> 7899/TCP 113s\n+service/harborcluster-sample-harbor-harbor-portal ClusterIP 10.96.177.105 <none> 443/TCP 109s\n+service/harborcluster-sample-harbor-harbor-registry ClusterIP 10.96.24.80 <none> 443/TCP,8001/TCP 105s\n+service/harborcluster-sample-harbor-harbor-registryctl ClusterIP 10.96.171.157 <none> 443/TCP 105s\n+service/harborcluster-sample-harbor-harbor-trivy ClusterIP 10.96.163.122 <none> 443/TCP 108s\n+service/minio ClusterIP 10.96.89.191 <none> 80/TCP 3m25s\n+service/minio-harborcluster-sample-console ClusterIP 10.96.29.2 <none> 9090/TCP 3m24s\n+service/minio-harborcluster-sample-hl ClusterIP None <none> 9000/TCP 3m23s\n+service/postgresql-cluster-sample-ns-harborcluster-sample ClusterIP 10.96.16.82 <none> 5432/TCP 3m31s\n+service/postgresql-cluster-sample-ns-harborcluster-sample-config ClusterIP None <none> <none> 3m23s\n+service/postgresql-cluster-sample-ns-harborcluster-sample-repl ClusterIP 10.96.33.5 <none> 5432/TCP 3m31s\n+service/rfs-harborcluster-sample-redis ClusterIP 10.96.53.11 <none> 26379/TCP 3m31s\nNAME READY UP-TO-DATE AVAILABLE AGE\n-deployment.apps/harborcluster-sample-harbor-harbor-chartmuseum 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-core 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-exporter 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-jobservice 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-notaryserver 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-notarysigner 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-portal 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-registry 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-registryctl 1/1 1 1 3h17m\n-deployment.apps/harborcluster-sample-harbor-harbor-trivy 1/1 1 1 3h17m\n-deployment.apps/rfs-harborcluster-sample-redis 1/1 1 1 3h18m\n+deployment.apps/harborcluster-sample-harbor-harbor-chartmuseum 1/1 1 1 105s\n+deployment.apps/harborcluster-sample-harbor-harbor-core 1/1 1 1 105s\n+deployment.apps/harborcluster-sample-harbor-harbor-exporter 1/1 1 1 98s\n+deployment.apps/harborcluster-sample-harbor-harbor-jobservice 1/1 1 1 98s\n+deployment.apps/harborcluster-sample-harbor-harbor-notaryserver 1/1 1 1 108s\n+deployment.apps/harborcluster-sample-harbor-harbor-notarysigner 1/1 1 1 113s\n+deployment.apps/harborcluster-sample-harbor-harbor-portal 1/1 1 1 109s\n+deployment.apps/harborcluster-sample-harbor-harbor-registry 1/1 1 1 104s\n+deployment.apps/harborcluster-sample-harbor-harbor-trivy 1/1 1 1 108s\n+deployment.apps/rfs-harborcluster-sample-redis 1/1 1 1 3m31s\nNAME DESIRED CURRENT READY AGE\n-replicaset.apps/harborcluster-sample-harbor-harbor-chartmuseum-5fcd966f47 1 1 1 3h1m\n-replicaset.apps/harborcluster-sample-harbor-harbor-core-74bb457c94 1 1 1 3h1m\n-replicaset.apps/harborcluster-sample-harbor-harbor-exporter-5dfb5c6f4 1 1 1 3h17m\n-replicaset.apps/harborcluster-sample-harbor-harbor-jobservice-58c8946c6c 1 1 1 3h17m\n-replicaset.apps/harborcluster-sample-harbor-harbor-notaryserver-7dc7dc5f8d 1 1 1 3h1m\n-replicaset.apps/harborcluster-sample-harbor-harbor-notarysigner-85459fbbb5 1 1 1 3h17m\n-replicaset.apps/harborcluster-sample-harbor-harbor-portal-844cf56674 1 1 1 3h17m\n-replicaset.apps/harborcluster-sample-harbor-harbor-registry-89487bb8c 1 1 1 3h1m\n-replicaset.apps/harborcluster-sample-harbor-harbor-registryctl-7db9744d44 1 1 1 3h17m\n-replicaset.apps/harborcluster-sample-harbor-harbor-trivy-5c795b8c77 1 1 1 3h17m\n-replicaset.apps/rfs-harborcluster-sample-redis-6fddf664 1 1 1 3h18m\n+replicaset.apps/harborcluster-sample-harbor-harbor-chartmuseum-5b68bd46b8 1 1 1 105s\n+replicaset.apps/harborcluster-sample-harbor-harbor-core-7849f9c844 1 1 1 105s\n+replicaset.apps/harborcluster-sample-harbor-harbor-exporter-dd5c99bc9 1 1 1 98s\n+replicaset.apps/harborcluster-sample-harbor-harbor-jobservice-668dd85cc4 1 1 1 98s\n+replicaset.apps/harborcluster-sample-harbor-harbor-notaryserver-77779bf8bf 1 1 1 108s\n+replicaset.apps/harborcluster-sample-harbor-harbor-notarysigner-5c88dc99d8 1 1 1 113s\n+replicaset.apps/harborcluster-sample-harbor-harbor-portal-64465c4954 1 1 1 109s\n+replicaset.apps/harborcluster-sample-harbor-harbor-registry-756dbcf5bb 1 1 1 104s\n+replicaset.apps/harborcluster-sample-harbor-harbor-trivy-599ff5c789 1 1 1 108s\n+replicaset.apps/rfs-harborcluster-sample-redis-6fddf664 1 1 1 3m31s\nNAME READY AGE\n-statefulset.apps/minio-harborcluster-sample-zone-harbor 2/2 3h17m\n-statefulset.apps/postgresql-cluster-sample-ns-harborcluster-sample 1/1 3h18m\n-statefulset.apps/rfr-harborcluster-sample-redis 1/1 3h18m\n+statefulset.apps/minio-harborcluster-sample-zone-harbor 2/2 3m23s\n+statefulset.apps/postgresql-cluster-sample-ns-harborcluster-sample 1/1 3m31s\n+statefulset.apps/rfr-harborcluster-sample-redis 1/1 3m31s\nNAME COMPLETIONS DURATION AGE\n-job.batch/minio-harborcluster-sample 1/1 11s 3h1m\n+job.batch/minio-harborcluster-sample 1/1 1s 117s\n+\n+NAME TEAM VERSION PODS VOLUME CPU-REQUEST MEMORY-REQUEST AGE STATUS\n+postgresql.acid.zalan.do/postgresql-cluster-sample-ns-harborcluster-sample postgresql-cluster-sample-ns 12 1 1Gi 100m 250Mi 3m31s Running\nNAME AGE\n-redisfailover.databases.spotahome.com/harborcluster-sample-redis 3h18m\n+redisfailover.databases.spotahome.com/harborcluster-sample-redis 3m31s\n```\nOf course, you can also check other resources such as `ingress`, `secret`, `pv`, `certificate` and `configMap` etc. under the specified namespace with `kubectl get xxxx -n cluster-sample-ns` commands.\n@@ -361,7 +370,7 @@ Of course, you can also check other resources such as `ingress`, `secret`, `pv`,\nNow you can try the deployed Harbor cluster.\n-1. Navigate to the Harbor home address `https://core.10.10.10.100.xip.io` and login Harbor with the root user `admin` and the password you provided in the deployment manifest above.\n+1. Navigate to the Harbor home address `https://core.10.10.10.100.nip.io` and login Harbor with the root user `admin` and the password you provided in the deployment manifest above.\n>In case you forgot the password, try to get it with the command:\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
doc(tutorial): update the out-of-date info
|
254,893
|
02.03.2022 19:46:26
| -28,800
|
021bb300703fad4f48713ba359c20936ee008214
|
doc(README): update for 1.2 GA
Update the Redis version
Update the feature list to move some Day2 functions to the future list
Update the release plans
- remove 1.2
- add 1.4
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -34,21 +34,27 @@ Harbor deployment stack is controlled by a custom Harbor resource `HarborCluster\n* Support services exposed with [ingress](https://kubernetes.io/fr/docs/concepts/services-networking/ingress/): [nginx(default)](https://git.k8s.io/ingress-nginx/README.md#readme), [gce](https://git.k8s.io/ingress-gce/README.md#readme), [contour](https://github.com/projectcontour/contour) and `ncp`\n* Support Day2 operations\n* Configures Harbor system settings with configuration CRD (`recommend`) or labeled ConfigMap (`deprecated`)\n+\n+## Future features\n+\n+* Support Day2 operations\n* Image pulling secret auto-injection\n* Auto mapping Kubernetes namespaces to the Harbor project\n* Image pulling path auto-rewriting\n* Transparent proxy cache settings\n-\n-## Future features\n-\n+ * Certification auto injection\n+ * Manage Harbor resources with the declaration way\n+ * Robot account\n+ * Project\n+ * and more\n* [Auto-scaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) for each component.\n* Backup/restore data (registry layer, chartmuseum data, databases content).\n* Support services exposed with LoadBalancer\n## Release plans\n-* [Release 1.2](https://github.com/goharbor/harbor-operator/projects/7)\n* [Release 1.3](https://github.com/goharbor/harbor-operator/projects/9)\n+* [Release 1.4](https://github.com/goharbor/harbor-operator/projects/12)\n## Getting started\n@@ -60,14 +66,12 @@ Versions of the underlying components are listed below:\n| Components | Harbor | MinIO operator | PostgreSQL operator | Redis operator |\n|---------------|-------------------|----------------|---------------------|----------------|\n-| Versions | 2.4.x `[1]` | 4.3.2 | 1.6.3 | 1.0.1 `[2]` |\n+| Versions | 2.4.x `[1]` | 4.3.2 | 1.6.3 | 1.1.1 |\nNOTES:\n[1] `.x` means all the patch releases of Harbor can be naturally supported in one operator version.\n-[2] Use a [forked version](https://github.com/spotahome/redis-operator) of [spotahome/redis-operator](https://github.com/spotahome/redis-operator).\n-\n## Compatibility\n### Applicative Kubernetes versions\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
doc(README): update for 1.2 GA (#851)
- Update the Redis version
- Update the feature list to move some Day2 functions to the future list
- Update the release plans
- remove 1.2
- add 1.4
|
254,893
|
02.03.2022 20:11:46
| -28,800
|
ae550eb9d21ca4ed174c6a1c63d82e25419ac0aa
|
doc(day2 config): remove day2 realted content out
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -115,7 +115,7 @@ Harbor operator exposes the frontend service with ingress (CRD version: `v1beta1\n* [Manifests references](./docs/manifests-reference.md)\n* [Customize storage, database and cache services](./docs/installation/customize-storage-db-redis.md)\n* [Customize images](./docs/customize-images.md)\n-* [Day2 operations](docs/day2/day2-operations.md)\n+* [Day2 configurations](docs/day2/day2-configurations.md)\n* [Upgrade Harbor cluster](./docs/LCM/upgrade-cluster.md)\n* [Delete Harbor cluster](./docs/LCM/cluster-deletion.md)\n* [Backup data](./docs/LCM/backup-data.md)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/day2/day2-configurations.md",
"diff": "+# Day2 configurations\n+\n+Initially, we configure harbor by means of configmap, but currently we recommend using `HarborConfiguration` CRD to configure harbor, for the configmap method will be deprecated in version 1.2, those who have used and still use configmap will be automatically converted to `HarborConfiguration` CR by the controller, and automatically remove old configmap.\n+> The harbor configuration items can be found in [harbor swagger](https://github.com/goharbor/harbor/blob/0867a6bfd6f33149f86a7ae8a740f5e1f976cafa/api/v2.0/swagger.yaml#L7990).\n+\n+#### ConfigMap (deprecated)\n+\n+First you need to prepare a config map to provide your harbor configurations, apply the config map in the same namespace as harborcluster. In particular, you need to add an annotation (`goharbor.io/configuration: <harbor cluster name>`) to your config map to mark which harborcluster it is acting on.\n+\n+In addition, in order to protect the password from being displayed directly in the config map, you need to define the password inside the secret, and then specify the name of the secret in the configuration. We currently offer these type of secret configurations fields: `\"email_password\", \"ldap_search_password\", \"uaa_client_secret\", \"oidc_client_secret\"`.\n+\n+**ConfigMap example**:\n+\n+```yaml\n+apiVersion: v1\n+kind: Secret\n+metadata:\n+ name: secret-sample\n+ namespace: cluster-sample-ns\n+type: Opaque\n+data:\n+ # the key is same with fields name.\n+ email_password: YmFyCg==\n+```\n+\n+```yaml\n+apiVersion: v1\n+kind: ConfigMap\n+metadata:\n+ name: test-config\n+ # namespace same with harborcluster cr namespace.\n+ namespace: cluster-sample-ns\n+ annotations:\n+ # required.\n+ # if not define the anno, the config map will not work.\n+ # the key is `goharbor.io/configuration`, and the value is your harborcluster cr name.\n+ goharbor.io/configuration: harborcluster-sample\n+data:\n+ # provide your harbor configuration by yaml format.\n+ config.yaml: |\n+ email_ssl: true\n+ email_password: secret-sample # the value is the name of secret which store the email_password.\n+```\n+\n+#### CRD-based HarborConfiguration\n+\n+**Example of HarborConfiguration**:\n+\n+```yaml\n+apiVersion: v1\n+kind: Secret\n+metadata:\n+ name: secret-sample\n+ namespace: cluster-sample-ns\n+type: Opaque\n+data:\n+ # the key is same with fields name.\n+ email_password: YmFyCg==\n+```\n+\n+```yaml\n+apiVersion: goharbor.io/v1beta1\n+kind: HarborConfiguration\n+metadata:\n+ name: test-config\n+ namespace: cluster-sample-ns\n+spec:\n+ # your harbor configuration\n+ configuration:\n+ email_password: secret-sample\n+ email_ssl: true\n+ harborClusterRef: harborcluster-sample\n+```\n+\n+After apply your `HarborConfiguration` CR to kubernetes cluster, the controller of `HarborConfiguration` will apply your configuration to harbor instance, you can see the result of configuration from CR status.\n+\n+```yaml\n+status:\n+ lastApplyTime: \"2021-06-04T06:07:53Z\"\n+ lastConfiguration:\n+ configuration:\n+ email_password: secret-sample\n+ email_ssl: true\n+ status: Success\n+```\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
doc(day2 config): remove day2 realted content out (#852)
Signed-off-by: Steven Zou <szou@vmware.com>
|
254,893
|
05.03.2022 16:07:36
| -28,800
|
563fdc1d5ac376f248a2d8efecd010aeee20069c
|
doc(day2 doc): fix doc lint error
|
[
{
"change_type": "MODIFY",
"old_path": "docs/day2/day2-configurations.md",
"new_path": "docs/day2/day2-configurations.md",
"diff": "Initially, we configure harbor by means of configmap, but currently we recommend using `HarborConfiguration` CRD to configure harbor, for the configmap method will be deprecated in version 1.2, those who have used and still use configmap will be automatically converted to `HarborConfiguration` CR by the controller, and automatically remove old configmap.\n> The harbor configuration items can be found in [harbor swagger](https://github.com/goharbor/harbor/blob/0867a6bfd6f33149f86a7ae8a740f5e1f976cafa/api/v2.0/swagger.yaml#L7990).\n-#### ConfigMap (deprecated)\n+## ConfigMap (deprecated)\nFirst you need to prepare a config map to provide your harbor configurations, apply the config map in the same namespace as harborcluster. In particular, you need to add an annotation (`goharbor.io/configuration: <harbor cluster name>`) to your config map to mark which harborcluster it is acting on.\n@@ -42,7 +42,7 @@ data:\nemail_password: secret-sample # the value is the name of secret which store the email_password.\n```\n-#### CRD-based HarborConfiguration\n+## CRD-based HarborConfiguration\n**Example of HarborConfiguration**:\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
doc(day2 doc): fix doc lint error
|
254,875
|
05.03.2022 17:41:41
| -28,800
|
bc628754ae1572ec953dd54aad8a35c41452b9d2
|
use fix postgresql/redis image in go tests
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/internal/test/postgresql/postgres.go",
"new_path": "controllers/goharbor/internal/test/postgresql/postgres.go",
"diff": "@@ -103,7 +103,7 @@ func New(ctx context.Context, ns string, databases ...string) harbormetav1.Postg\n},\nContainers: []corev1.Container{{\nName: \"database\",\n- Image: \"bitnami/postgresql\",\n+ Image: \"bitnami/postgresql:13.6.0\",\nEnv: []corev1.EnvVar{\n{\nName: \"POSTGRESQL_PASSWORD\",\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/internal/test/redis/redis.go",
"new_path": "controllers/goharbor/internal/test/redis/redis.go",
"diff": "@@ -72,7 +72,7 @@ func New(ctx context.Context, ns string) harbormetav1.RedisConnection {\n}},\nContainers: []corev1.Container{{\nName: \"redis\",\n- Image: \"bitnami/redis\",\n+ Image: \"bitnami/redis:6.2.6\",\nEnv: []corev1.EnvVar{{\nName: \"REDIS_PASSWORD\",\nValueFrom: &corev1.EnvVarSource{\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
use fix postgresql/redis image in go tests
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
05.03.2022 10:29:19
| -28,800
|
cb123f68de4c6a70d2eb6f50f8fac84f01f17dae
|
bump up redis-operator v1.1.1
|
[
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/README.md",
"new_path": "charts/harbor-operator/README.md",
"diff": "@@ -53,7 +53,7 @@ Deploy Harbor Operator\n| priorityClassName | string | `\"\"` | priority class to be used for the harbor-operator pods |\n| rbac.create | bool | `true` | Whether to install Role Based Access Control |\n| redis-operator.enabled | bool | `false` | Whether to enabled [Redis Operator](https://github.com/spotahome/redis-operator) |\n-| redis-operator.rbac.install | bool | `true` | |\n+| redis-operator.image.tag | string | `\"v1.1.1\"` | |\n| replicaCount | int | `1` | Number of replicas for the controller |\n| resources | object | `{\"limits\":{\"cpu\":\"500m\",\"memory\":\"300Mi\"},\"requests\":{\"cpu\":\"300m\",\"memory\":\"200Mi\"}}` | Expects input structure as per specification <https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#resourcerequirements-v1-core> |\n| service.port | int | `443` | Expose port for WebHook controller |\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/values.yaml",
"new_path": "charts/harbor-operator/values.yaml",
"diff": "@@ -252,8 +252,8 @@ affinity: {}\nredis-operator:\n# redis-operator.enabled -- Whether to enabled [Redis Operator](https://github.com/spotahome/redis-operator)\nenabled: false\n- rbac:\n- install: true\n+ image:\n+ tag: v1.1.1\nminio-operator:\n# minio-operator.enabled -- Whether to enabled [MinIO Operator](https://github.com/minio/operator)\n"
},
{
"change_type": "MODIFY",
"old_path": "go.mod",
"new_path": "go.mod",
"diff": "@@ -25,7 +25,7 @@ require (\ngithub.com/prometheus/client_golang v1.11.0\ngithub.com/sethvargo/go-password v0.1.3\ngithub.com/sirupsen/logrus v1.8.1\n- github.com/spotahome/redis-operator v1.1.0-rc.3\n+ github.com/spotahome/redis-operator v1.1.1\ngithub.com/stretchr/testify v1.7.0\ngithub.com/theupdateframework/notary v0.6.1\ngithub.com/uber/jaeger-client-go v2.24.0+incompatible\n"
},
{
"change_type": "MODIFY",
"old_path": "go.sum",
"new_path": "go.sum",
"diff": "@@ -1381,8 +1381,8 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q\ngithub.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=\ngithub.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=\ngithub.com/spotahome/kooper/v2 v2.1.0/go.mod h1:rhtV7NglWeNF13v8Y3Ct6E1uEpz0ahRIPh9KIVGvp/M=\n-github.com/spotahome/redis-operator v1.1.0-rc.3 h1:h04m62vKSig+okZ+Mm24gEfzBPNnTKY8pybQC3gJZfM=\n-github.com/spotahome/redis-operator v1.1.0-rc.3/go.mod h1:bXvvnesGbda+UXMX4SlXF9aBk7mFHtyE1ATKnvBntNk=\n+github.com/spotahome/redis-operator v1.1.1 h1:0GBtvUXOodv6n10FHySFrIKSj6ykZOymgWJrjL58rpw=\n+github.com/spotahome/redis-operator v1.1.1/go.mod h1:bXvvnesGbda+UXMX4SlXF9aBk7mFHtyE1ATKnvBntNk=\ngithub.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=\ngithub.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=\ngithub.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -38800,7 +38800,7 @@ apiVersion: apps/v1\nkind: Deployment\nmetadata:\nannotations:\n- cache.goharbor.io/version: v1.1.0-rc.3\n+ cache.goharbor.io/version: v1.1.1\ndatabase.goharbor.io/version: v1.5.0\nstorage.goharbor.io/version: v4.3.2\nlabels:\n@@ -39017,7 +39017,7 @@ spec:\napp: redisoperator\nspec:\ncontainers:\n- - image: quay.io/spotahome/redis-operator:v1.1.0-rc.3\n+ - image: quay.io/spotahome/redis-operator:v1.1.1\nimagePullPolicy: IfNotPresent\nname: app\nresources:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -15,8 +15,8 @@ commonAnnotations:\nresources:\n- ../../config/default # harbor operator\n- patch/namespace.yaml\n- - https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.0-rc.3 # redis operator\n- - https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.0-rc.3 # redis operator crd\n+ - https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.1 # redis operator\n+ - https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.1 # redis operator crd\n- github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator\n- github.com/minio/operator?ref=v4.3.2 # minIO storage operator\n@@ -38,7 +38,7 @@ patchesJson6902:\nimages:\n- name: quay.io/spotahome/redis-operator\n- newTag: v1.1.0-rc.3\n+ newTag: v1.1.1\n- name: minio/operator\nnewName: quay.io/minio/operator\n- name: minio/console\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/patch/annotations.yaml",
"new_path": "manifests/cluster/patch/annotations.yaml",
"diff": "- op: add\npath: \"/metadata/annotations\"\nvalue:\n- cache.goharbor.io/version: v1.1.0-rc.3\n+ cache.goharbor.io/version: v1.1.1\ndatabase.goharbor.io/version: v1.5.0\nstorage.goharbor.io/version: v4.3.2\n\\ No newline at end of file\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
bump up redis-operator v1.1.1
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,878
|
10.03.2022 21:03:28
| -28,800
|
96639f91a270de1cc068a261a42f2f9c939633f3
|
upgrade minio operator to v4.4.9
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -66,7 +66,7 @@ Versions of the underlying components are listed below:\n| Components | Harbor | MinIO operator | PostgreSQL operator | Redis operator |\n|---------------|-------------------|----------------|---------------------|----------------|\n-| Versions | 2.4.x `[1]` | 4.3.2 | 1.6.3 | 1.1.1 |\n+| Versions | 2.4.x `[1]` | 4.4.9 | 1.6.3 | 1.1.1 |\nNOTES:\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/README.md",
"new_path": "charts/harbor-operator/README.md",
"diff": "@@ -43,6 +43,7 @@ Deploy Harbor Operator\n| leaderElection.namespace | string | `\"kube-system\"` | The namespace used to store the ConfigMap for leader election |\n| logLevel | int | `4` | Set the verbosity of controller. Range of 0 - 6 with 6 being the most verbose. Info level is 4. |\n| minio-operator.enabled | bool | `false` | Whether to enabled [MinIO Operator](https://github.com/minio/operator) |\n+| minio-operator.image.tag | string | `\"v4.4.9\"` | |\n| nameOverride | string | `\"\"` | |\n| nodeSelector | object | `{}` | Expects input structure as per specification <https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#nodeselector-v1-core> For example: `[ { \"matchExpressions\": [ { \"key\": \"kubernetes.io/e2e-az-name\", \"operator\": \"In\", \"values\": [ \"e2e-az1\", \"e2e-az2\" ] } ] } ]` |\n| podAnnotations | object | `{}` | Additional annotations to add to the controller Pods |\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/values.yaml",
"new_path": "charts/harbor-operator/values.yaml",
"diff": "@@ -258,6 +258,8 @@ redis-operator:\nminio-operator:\n# minio-operator.enabled -- Whether to enabled [MinIO Operator](https://github.com/minio/operator)\nenabled: false\n+ image:\n+ tag: v4.4.9\npostgres-operator:\n# postgres-operator.enabled -- Whether to enabled [Postgres operator](https://github.com/zalando/postgres-operator)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/installation/kustomization-custom.md",
"new_path": "docs/installation/kustomization-custom.md",
"diff": "@@ -66,7 +66,7 @@ kubectl delete -f https://raw.githubusercontent.com/spotahome/redis-operator/mas\n## Deploy Minio operator (Optional)\n-Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.3.2#1-install-the-minio-operator) to install the Minio operator.\n+Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.4.9#deploy-the-minio-operator-and-create-a-tenant) to install the Minio operator.\nOr use the Minio kustomization template:\n@@ -74,7 +74,7 @@ Or use the Minio kustomization template:\n# Clone the codebase.\ngit clone https://github.com/minio/operator.git && \\\ncd operator && \\\n-git checkout tags/v4.3.2 -b minio-v4.3.2\n+git checkout tags/v4.4.9 -b minio-v4.4.9\n# Apply with the kustomization template that is located the root dir of the codebase.\nkustomize build | kubectl apply -f -\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -26382,8 +26382,6 @@ spec:\nproperties:\nbucketDNS:\ntype: boolean\n- required:\n- - bucketDNS\ntype: object\nsecurityContext:\nproperties:\n@@ -28325,6 +28323,10 @@ spec:\ntype: object\nnullable: true\ntype: array\n+ provisionedBuckets:\n+ type: boolean\n+ provisionedUsers:\n+ type: boolean\nrevision:\nformat: int32\ntype: integer\n@@ -28392,6 +28394,17 @@ spec:\ntype: object\nspec:\nproperties:\n+ buckets:\n+ items:\n+ properties:\n+ name:\n+ type: string\n+ objectLock:\n+ type: boolean\n+ region:\n+ type: string\n+ type: object\n+ type: array\ncertConfig:\nproperties:\ncommonName:\n@@ -28513,6 +28526,18 @@ spec:\nrequired:\n- name\ntype: object\n+ features:\n+ properties:\n+ bucketDNS:\n+ type: boolean\n+ domains:\n+ properties:\n+ minio:\n+ items:\n+ type: string\n+ type: array\n+ type: object\n+ type: object\nimage:\ntype: string\nimagePullPolicy:\n@@ -30995,16 +31020,7 @@ spec:\ntype: array\ntype: object\nprometheusOperator:\n- properties:\n- annotations:\n- additionalProperties:\n- type: string\n- type: object\n- labels:\n- additionalProperties:\n- type: string\n- type: object\n- type: object\n+ type: boolean\nreadiness:\nproperties:\nexec:\n@@ -31076,8 +31092,6 @@ spec:\nproperties:\nbucketDNS:\ntype: boolean\n- required:\n- - bucketDNS\ntype: object\nserviceAccountName:\ntype: string\n@@ -32526,6 +32540,10 @@ spec:\ntype: object\nnullable: true\ntype: array\n+ provisionedBuckets:\n+ type: boolean\n+ provisionedUsers:\n+ type: boolean\nrevision:\nformat: int32\ntype: integer\n@@ -37884,7 +37902,7 @@ rules:\n- apiGroups:\n- monitoring.coreos.com\nresources:\n- - servicemonitors\n+ - prometheuses\nverbs:\n- '*'\n- apiGroups:\n@@ -38802,7 +38820,7 @@ metadata:\nannotations:\ncache.goharbor.io/version: v1.1.1\ndatabase.goharbor.io/version: v1.5.0\n- storage.goharbor.io/version: v4.3.2\n+ storage.goharbor.io/version: v4.4.9\nlabels:\ncontrol-plane: harbor-operator\nname: harbor-operator\n@@ -38927,7 +38945,7 @@ spec:\n- minio-operator\ntopologyKey: kubernetes.io/hostname\ncontainers:\n- - image: quay.io/minio/operator:v4.3.2\n+ - image: quay.io/minio/operator:v4.4.9\nimagePullPolicy: IfNotPresent\nname: minio-operator\nresources:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -18,7 +18,7 @@ resources:\n- https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.1 # redis operator\n- https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.1 # redis operator crd\n- github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator\n- - github.com/minio/operator?ref=v4.3.2 # minIO storage operator\n+ - github.com/minio/operator?ref=v4.4.9 # minIO storage operator\n# If you have to override the image source, uncomment this patch and also change the image source in the patch/image-source.yaml file.\n# Then rebuild.\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/patch/annotations.yaml",
"new_path": "manifests/cluster/patch/annotations.yaml",
"diff": "value:\ncache.goharbor.io/version: v1.1.1\ndatabase.goharbor.io/version: v1.5.0\n- storage.goharbor.io/version: v4.3.2\n\\ No newline at end of file\n+ storage.goharbor.io/version: v4.4.9\n\\ No newline at end of file\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
upgrade minio operator to v4.4.9 (#841)
Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>
|
254,875
|
08.03.2022 19:59:52
| -28,800
|
1a3f4a0b65f66f9c999406d0e804ef0f3941634a
|
add prefix folder for chartmuseum
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/chartmuseum/deployments.go",
"new_path": "controllers/goharbor/chartmuseum/deployments.go",
"diff": "@@ -136,7 +136,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.\nValue: GcsJSONKeyFilePath,\n}, corev1.EnvVar{\nName: \"STORAGE_GOOGLE_PREFIX\",\n- Value: chartMuseum.Spec.Chart.Storage.Gcs.PathPrefix,\n+ Value: getChartFolder(chartMuseum.Spec.Chart.Storage.Gcs.PathPrefix),\n})\nvolumes = append(volumes, corev1.Volume{\n@@ -176,7 +176,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.\nValue: chartMuseum.Spec.Chart.Storage.Azure.BaseURL,\n}, corev1.EnvVar{\nName: \"STORAGE_MICROSOFT_PREFIX\",\n- Value: chartMuseum.Spec.Chart.Storage.Azure.PathPrefix,\n+ Value: getChartFolder(chartMuseum.Spec.Chart.Storage.Azure.PathPrefix),\n})\nif chartMuseum.Spec.Chart.Storage.Azure.AccountKeyRef != \"\" {\n@@ -206,7 +206,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.\nValue: chartMuseum.Spec.Chart.Storage.Amazon.Bucket,\n}, corev1.EnvVar{\nName: \"STORAGE_AMAZON_PREFIX\",\n- Value: chartMuseum.Spec.Chart.Storage.Amazon.Prefix,\n+ Value: getChartFolder(chartMuseum.Spec.Chart.Storage.Amazon.Prefix),\n}, corev1.EnvVar{\nName: \"STORAGE_AMAZON_REGION\",\nValue: chartMuseum.Spec.Chart.Storage.Amazon.Region,\n@@ -249,7 +249,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.\n},\n}, corev1.EnvVar{\nName: \"STORAGE_OPENSTACK_PREFIX\",\n- Value: chartMuseum.Spec.Chart.Storage.OpenStack.Prefix,\n+ Value: getChartFolder(chartMuseum.Spec.Chart.Storage.OpenStack.Prefix),\n}, corev1.EnvVar{\nName: \"STORAGE_OPENSTACK_REGION\",\nValue: chartMuseum.Spec.Chart.Storage.OpenStack.Region,\n@@ -433,3 +433,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.\nreturn deploy, nil\n}\n+\n+func getChartFolder(prefix string) string {\n+ return path.Join(prefix, \"chart_storage\")\n+}\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
add prefix folder for chartmuseum
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
05.03.2022 10:38:31
| -28,800
|
c664c8fdd34436ec38aa40abd350413c4846dede
|
use harbor v2.4.1 as default sample
|
[
{
"change_type": "MODIFY",
"old_path": "config/samples/harborcluster-minimal/goharbor_v1alpha3_harbor.yaml",
"new_path": "config/samples/harborcluster-minimal/goharbor_v1alpha3_harbor.yaml",
"diff": "@@ -3,7 +3,7 @@ kind: HarborCluster\nmetadata:\nname: sample\nspec:\n- version: 2.4.0\n+ version: 2.4.1\nharborAdminPasswordRef: admin-core-secret\nexternalURL: https://core.harbor.domain\nexpose:\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/day2/day2-operations.md",
"new_path": "docs/day2/day2-operations.md",
"diff": "@@ -218,7 +218,7 @@ spec:\naccessCredential:\nnamespace: kube-system\naccessSecretRef: mysecret\n- version: 2.4.0\n+ version: 2.4.1\ninsecure: true\n```\n@@ -406,7 +406,7 @@ spec:\naccessCredential:\nnamespace: kube-system\naccessSecretRef: mysecret\n- version: 2.4.0\n+ version: 2.4.1\ninsecure: true\nrules: ## rules to define to rewrite image path\n- \"docker.io=>testharbor\" ## <repo-regex>,<harbor-project>\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/samples/full_stack.yaml",
"new_path": "manifests/samples/full_stack.yaml",
"diff": "@@ -67,7 +67,7 @@ metadata:\nname: harborcluster-sample\nnamespace: cluster-sample-ns\nspec:\n- version: 2.4.0\n+ version: 2.4.1\nlogLevel: info\nnetwork:\nipFamilies:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/samples/minimal_stack_fs.yaml",
"new_path": "manifests/samples/minimal_stack_fs.yaml",
"diff": "@@ -68,7 +68,7 @@ metadata:\nname: harborcluster-sample\nnamespace: cluster-sample-ns\nspec:\n- version: 2.4.0\n+ version: 2.4.1\nlogLevel: info\nimageSource:\nrepository: ghcr.io/goharbor\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/samples/minimal_stack_incluster.yaml",
"new_path": "manifests/samples/minimal_stack_incluster.yaml",
"diff": "@@ -67,7 +67,7 @@ metadata:\nname: harborcluster-sample\nnamespace: cluster-sample-ns\nspec:\n- version: 2.4.0\n+ version: 2.4.1\nlogLevel: info\nimageSource:\nrepository: ghcr.io/goharbor\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/samples/standard_stack.yaml",
"new_path": "manifests/samples/standard_stack.yaml",
"diff": "@@ -201,7 +201,7 @@ spec:\nhost: harbor-redis-master\npasswordRef: harbor-redis\nport: 6379\n- version: 2.4.0\n+ version: 2.4.1\nchartmuseum: {}\ncore:\ntokenIssuer:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/samples/standard_stack_fs.yaml",
"new_path": "manifests/samples/standard_stack_fs.yaml",
"diff": "@@ -119,7 +119,7 @@ metadata:\nname: harborcluster-sample\nnamespace: cluster-sample-ns\nspec:\n- version: 2.4.0\n+ version: 2.4.1\nlogLevel: info\nimageSource:\nrepository: ghcr.io/goharbor\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
use harbor v2.4.1 as default sample
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
17.03.2022 21:04:02
| -28,800
|
aa495a256eb0702d23d6d54624c8e6ffee5ffe3d
|
fix release docker build go version
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/release.yml",
"new_path": ".github/workflows/release.yml",
"diff": "@@ -43,6 +43,9 @@ jobs:\ndocker:\nruns-on: ubuntu-latest\nsteps:\n+ - uses: actions/setup-go@v2\n+ with:\n+ go-version: 1.17\n- uses: actions/checkout@v2\n- name: Build manager\nrun: |\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix release docker build go version
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,881
|
24.03.2022 18:03:56
| -28,800
|
e0d983b29a3923229c35ae4e3a3163c27f0b4e16
|
docs: fix day2 configuration sample cr
|
[
{
"change_type": "MODIFY",
"old_path": "docs/day2/day2-configurations.md",
"new_path": "docs/day2/day2-configurations.md",
"diff": "@@ -46,18 +46,6 @@ data:\n**Example of HarborConfiguration**:\n-```yaml\n-apiVersion: v1\n-kind: Secret\n-metadata:\n- name: secret-sample\n- namespace: cluster-sample-ns\n-type: Opaque\n-data:\n- # the key is same with fields name.\n- email_password: YmFyCg==\n-```\n-\n```yaml\napiVersion: goharbor.io/v1beta1\nkind: HarborConfiguration\n@@ -67,8 +55,9 @@ metadata:\nspec:\n# your harbor configuration\nconfiguration:\n- email_password: secret-sample\n- email_ssl: true\n+ robotTokenDuration: 45\n+ robotNamePrefix: harbor$\n+ notificationEnable: false\nharborClusterRef: harborcluster-sample\n```\n@@ -79,7 +68,8 @@ status:\nlastApplyTime: \"2021-06-04T06:07:53Z\"\nlastConfiguration:\nconfiguration:\n- email_password: secret-sample\n- email_ssl: true\n+ robotTokenDuration: 45\n+ robotNamePrefix: harbor$\n+ notificationEnable: false\nstatus: Success\n```\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
docs: fix day2 configuration sample cr
Signed-off-by: chlins <chenyuzh@vmware.com>
|
254,875
|
22.03.2022 10:07:14
| -28,800
|
95a56f37f943c9c67261ab542776c7a5cc8e855b
|
update minio-operator 4.4.9
|
[
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/Chart.lock",
"new_path": "charts/harbor-operator/Chart.lock",
"diff": "dependencies:\n-- name: minio-operator\n+- name: operator\nrepository: https://operator.min.io/\n- version: 4.3.2\n+ version: 4.4.9\n- name: redis-operator\nrepository: https://spotahome.github.io/redis-operator\nversion: 3.1.4\n- name: postgres-operator\nrepository: \"\"\nversion: 1.6.3\n-digest: sha256:5f751a10a1bebdc645382cfc2a24c2dfcb5d1b55f22e5ccb3d9dec48932e7e6b\n-generated: \"2022-03-24T17:49:40.180836609+08:00\"\n+digest: sha256:f2bd62e3b155494472fdded8c56843a39ee29e8f67773f38f56165dcab818137\n+generated: \"2022-03-21T16:47:50.074081158Z\"\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/Chart.yaml",
"new_path": "charts/harbor-operator/Chart.yaml",
"diff": "@@ -20,8 +20,8 @@ home: https://github.com/goharbor/harbor-operator\nicon: https://branding.cncf.io/img/projects/harbor/icon/color/harbor-icon-color.svg\ndependencies:\n-- name: minio-operator\n- version: 4.3.2\n+- name: operator\n+ version: 4.4.9\ncondition: minio-operator.enabled\nrepository: https://operator.min.io/\ntags:\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/README.md",
"new_path": "charts/harbor-operator/README.md",
"diff": "@@ -43,7 +43,6 @@ Deploy Harbor Operator\n| leaderElection.namespace | string | `\"kube-system\"` | The namespace used to store the ConfigMap for leader election |\n| logLevel | int | `4` | Set the verbosity of controller. Range of 0 - 6 with 6 being the most verbose. Info level is 4. |\n| minio-operator.enabled | bool | `false` | Whether to enabled [MinIO Operator](https://github.com/minio/operator) |\n-| minio-operator.image.tag | string | `\"v4.4.9\"` | |\n| nameOverride | string | `\"\"` | |\n| nodeSelector | object | `{}` | Expects input structure as per specification <https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#nodeselector-v1-core> For example: `[ { \"matchExpressions\": [ { \"key\": \"kubernetes.io/e2e-az-name\", \"operator\": \"In\", \"values\": [ \"e2e-az1\", \"e2e-az2\" ] } ] } ]` |\n| podAnnotations | object | `{}` | Additional annotations to add to the controller Pods |\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/values.yaml",
"new_path": "charts/harbor-operator/values.yaml",
"diff": "@@ -258,8 +258,6 @@ redis-operator:\nminio-operator:\n# minio-operator.enabled -- Whether to enabled [MinIO Operator](https://github.com/minio/operator)\nenabled: false\n- image:\n- tag: v4.4.9\npostgres-operator:\n# postgres-operator.enabled -- Whether to enabled [Postgres operator](https://github.com/zalando/postgres-operator)\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
update minio-operator 4.4.9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
27.05.2022 20:44:58
| -28,800
|
df98067504e07a8dffd47517f374981c9f929b0d
|
update version 1.3.0-rc1
|
[
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/README.md",
"new_path": "charts/harbor-operator/README.md",
"diff": "@@ -37,7 +37,7 @@ Deploy Harbor Operator\n| harborClass | string | `\"\"` | Class name of the Harbor operator |\n| image.pullPolicy | string | `\"IfNotPresent\"` | The image pull policy for the controller. |\n| image.repository | string | `\"goharbor/harbor-operator\"` | The image repository whose default is the chart appVersion. |\n-| image.tag | string | `\"dev\"` | The image tag whose default is the chart appVersion. |\n+| image.tag | string | `\"v1.3.0-rc1\"` | The image tag whose default is the chart appVersion. |\n| imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when pulling images <https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/> For example: `[ {\"name\":\"image-pull-secret\"} ]` |\n| installCRDs | bool | `false` | If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED |\n| leaderElection.namespace | string | `\"kube-system\"` | The namespace used to store the ConfigMap for leader election |\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/values.yaml",
"new_path": "charts/harbor-operator/values.yaml",
"diff": "@@ -4,7 +4,7 @@ image:\n# image.pullPolicy -- The image pull policy for the controller.\npullPolicy: IfNotPresent\n# image.tag -- The image tag whose default is the chart appVersion.\n- tag: \"dev\"\n+ tag: \"v1.3.0-rc1\"\n# installCRDs -- If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED\ninstallCRDs: false\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -4,7 +4,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbor-operator-ns\n---\napiVersion: apiextensions.k8s.io/v1\n@@ -15,7 +15,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: chartmuseums.goharbor.io\nspec:\nconversion:\n@@ -4356,7 +4356,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: cores.goharbor.io\nspec:\nconversion:\n@@ -5580,7 +5580,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: exporters.goharbor.io\nspec:\nconversion:\n@@ -6316,7 +6316,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harborclusters.goharbor.io\nspec:\nconversion:\n@@ -11561,7 +11561,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harborconfigurations.goharbor.io\nspec:\n@@ -12036,7 +12036,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbors.goharbor.io\nspec:\nconversion:\n@@ -15948,7 +15948,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harborserverconfigurations.goharbor.io\nspec:\n@@ -16122,7 +16122,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: jobservices.goharbor.io\nspec:\nconversion:\n@@ -23583,7 +23583,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: notaryservers.goharbor.io\nspec:\nconversion:\n@@ -24294,7 +24294,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: notarysigners.goharbor.io\nspec:\nconversion:\n@@ -24917,7 +24917,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: portals.goharbor.io\nspec:\nconversion:\n@@ -25392,7 +25392,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: pullsecretbindings.goharbor.io\nspec:\n@@ -25498,7 +25498,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: (devel)\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: redisfailovers.databases.spotahome.com\nspec:\n@@ -28536,7 +28536,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: registries.goharbor.io\nspec:\nconversion:\n@@ -33898,7 +33898,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: registrycontrollers.goharbor.io\nspec:\nconversion:\n@@ -34412,7 +34412,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.4.7\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -42660,7 +42660,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: trivies.goharbor.io\nspec:\nconversion:\n@@ -49838,7 +49838,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -49851,7 +49851,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-operator\nnamespace: harbor-operator-ns\n---\n@@ -49861,7 +49861,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: redisoperator\nnamespace: harbor-operator-ns\n---\n@@ -49871,7 +49871,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: leader-election-role\nnamespace: harbor-operator-ns\nrules:\n@@ -49908,7 +49908,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harbor-operator-role\nrules:\n@@ -50534,7 +50534,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -50672,7 +50672,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-operator\nrules:\n- apiGroups:\n@@ -50856,7 +50856,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-pod\nrules:\n- apiGroups:\n@@ -50895,7 +50895,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: redisoperator\nrules:\n- apiGroups:\n@@ -50949,7 +50949,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: leader-election-rolebinding\nnamespace: harbor-operator-ns\nroleRef:\n@@ -50967,7 +50967,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbor-operator-rolebinding\nroleRef:\napiGroup: rbac.authorization.k8s.io\n@@ -50984,7 +50984,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -51004,7 +51004,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-operator\nroleRef:\napiGroup: rbac.authorization.k8s.io\n@@ -51021,7 +51021,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: redisoperator\nroleRef:\napiGroup: rbac.authorization.k8s.io\n@@ -51107,7 +51107,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: config\nnamespace: harbor-operator-ns\n---\n@@ -51608,7 +51608,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: config-template\nnamespace: harbor-operator-ns\n---\n@@ -51671,7 +51671,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-operator\nnamespace: harbor-operator-ns\n---\n@@ -51681,7 +51681,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -51704,7 +51704,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: postgres-operator\nnamespace: harbor-operator-ns\nspec:\n@@ -51722,7 +51722,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: webhook-service\nnamespace: harbor-operator-ns\nspec:\n@@ -51752,7 +51752,7 @@ spec:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\ncontrol-plane: harbor-operator\nspec:\n@@ -51769,7 +51769,7 @@ spec:\nfieldPath: metadata.namespace\n- name: CONFIGURATION_FROM\nvalue: env,file:/etc/harbor-operator/config.yaml\n- image: ghcr.io/goharbor/harbor-operator:dev_master\n+ image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc1\nlivenessProbe:\nhttpGet:\npath: /healthz\n@@ -51829,7 +51829,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -51845,7 +51845,7 @@ spec:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n@@ -51883,7 +51883,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\napplication: postgres-operator\nname: postgres-operator\n@@ -51900,7 +51900,7 @@ spec:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\nname: postgres-operator\nspec:\n@@ -51931,7 +51931,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\napp: redisoperator\nname: redisoperator\n@@ -51948,7 +51948,7 @@ spec:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\napp: redisoperator\nspec:\n@@ -51976,7 +51976,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: serving-cert\nnamespace: harbor-operator-ns\nspec:\n@@ -51994,7 +51994,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: selfsigned-issuer\nnamespace: harbor-operator-ns\nspec:\n@@ -52007,7 +52007,7 @@ metadata:\ncert-manager.io/inject-ca-from: harbor-operator-ns/serving-cert\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: mutating-webhook-configuration\nwebhooks:\n- admissionReviewVersions:\n@@ -52065,7 +52065,7 @@ metadata:\ncert-manager.io/inject-ca-from: harbor-operator-ns/serving-cert\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: validating-webhook-configuration\nwebhooks:\n- admissionReviewVersions:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -8,7 +8,7 @@ namespace: harbor-operator-ns\ncommonAnnotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\n# All the referred deployment manifests\n# NOTES: when doing changes to the ref versions, please also do same changes in the patch/annotation.yaml file\n@@ -47,4 +47,4 @@ images:\nnewName: ghcr.io/goharbor/postgres-operator\n- name: goharbor/harbor-operator\nnewName: ghcr.io/goharbor/harbor-operator\n- newTag: dev_master\n+ newTag: v1.3.0-rc1\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/deployment.yaml",
"new_path": "manifests/harbor/deployment.yaml",
"diff": "@@ -4,7 +4,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbor-operator-ns\n---\napiVersion: apiextensions.k8s.io/v1\n@@ -15,7 +15,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: chartmuseums.goharbor.io\nspec:\nconversion:\n@@ -4356,7 +4356,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: cores.goharbor.io\nspec:\nconversion:\n@@ -5580,7 +5580,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: exporters.goharbor.io\nspec:\nconversion:\n@@ -6316,7 +6316,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harborclusters.goharbor.io\nspec:\nconversion:\n@@ -11561,7 +11561,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harborconfigurations.goharbor.io\nspec:\n@@ -12036,7 +12036,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbors.goharbor.io\nspec:\nconversion:\n@@ -15948,7 +15948,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harborserverconfigurations.goharbor.io\nspec:\n@@ -16122,7 +16122,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: jobservices.goharbor.io\nspec:\nconversion:\n@@ -23583,7 +23583,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: notaryservers.goharbor.io\nspec:\nconversion:\n@@ -24294,7 +24294,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: notarysigners.goharbor.io\nspec:\nconversion:\n@@ -24917,7 +24917,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: portals.goharbor.io\nspec:\nconversion:\n@@ -25392,7 +25392,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: pullsecretbindings.goharbor.io\nspec:\n@@ -25499,7 +25499,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: registries.goharbor.io\nspec:\nconversion:\n@@ -30861,7 +30861,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: registrycontrollers.goharbor.io\nspec:\nconversion:\n@@ -31376,7 +31376,7 @@ metadata:\ncontroller-gen.kubebuilder.io/version: v0.6.2\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: trivies.goharbor.io\nspec:\nconversion:\n@@ -38554,7 +38554,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: leader-election-role\nnamespace: harbor-operator-ns\nrules:\n@@ -38591,7 +38591,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\ncreationTimestamp: null\nname: harbor-operator-role\nrules:\n@@ -39217,7 +39217,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: leader-election-rolebinding\nnamespace: harbor-operator-ns\nroleRef:\n@@ -39235,7 +39235,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: harbor-operator-rolebinding\nroleRef:\napiGroup: rbac.authorization.k8s.io\n@@ -39321,7 +39321,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: config\nnamespace: harbor-operator-ns\n---\n@@ -39822,7 +39822,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: config-template\nnamespace: harbor-operator-ns\n---\n@@ -39832,7 +39832,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: webhook-service\nnamespace: harbor-operator-ns\nspec:\n@@ -39848,7 +39848,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\ncontrol-plane: harbor-operator\nname: harbor-operator\n@@ -39862,7 +39862,7 @@ spec:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nlabels:\ncontrol-plane: harbor-operator\nspec:\n@@ -39879,7 +39879,7 @@ spec:\nfieldPath: metadata.namespace\n- name: CONFIGURATION_FROM\nvalue: env,file:/etc/harbor-operator/config.yaml\n- image: ghcr.io/goharbor/harbor-operator:dev_master\n+ image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc1\nlivenessProbe:\nhttpGet:\npath: /healthz\n@@ -39939,7 +39939,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: serving-cert\nnamespace: harbor-operator-ns\nspec:\n@@ -39957,7 +39957,7 @@ metadata:\nannotations:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: selfsigned-issuer\nnamespace: harbor-operator-ns\nspec:\n@@ -39970,7 +39970,7 @@ metadata:\ncert-manager.io/inject-ca-from: harbor-operator-ns/serving-cert\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: mutating-webhook-configuration\nwebhooks:\n- admissionReviewVersions:\n@@ -40028,7 +40028,7 @@ metadata:\ncert-manager.io/inject-ca-from: harbor-operator-ns/serving-cert\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: harbor\n- goharbor.io/operator-version: v1.1.0\n+ goharbor.io/operator-version: v1.3.0\nname: validating-webhook-configuration\nwebhooks:\n- admissionReviewVersions:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/kustomization.yaml",
"new_path": "manifests/harbor/kustomization.yaml",
"diff": "@@ -6,7 +6,7 @@ namespace: harbor-operator-ns\n# Common annotations\ncommonAnnotations:\n- goharbor.io/operator-version: \"v1.1.0\"\n+ goharbor.io/operator-version: \"v1.3.0\"\ngoharbor.io/deploy-mode: \"harbor\"\ngoharbor.io/deploy-engine: \"Kustomization\"\n@@ -23,4 +23,4 @@ resources:\nimages:\n- name: goharbor/harbor-operator\nnewName: ghcr.io/goharbor/harbor-operator\n- newTag: dev_master\n\\ No newline at end of file\n+ newTag: v1.3.0-rc1\n\\ No newline at end of file\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
update version 1.3.0-rc1
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
09.06.2022 23:43:17
| -28,800
|
dd2d1e41e32087a45d2d6b9255cf1d96a77d0974
|
update minio 4.4.22
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -66,7 +66,7 @@ Versions of the underlying components are listed below:\n| Components | Harbor | MinIO operator | PostgreSQL operator | Redis operator |\n|---------------|-------------|----------------|---------------------|----------------|\n-| Versions | 2.5.x `[1]` | 4.4.9 | 1.6.3 | 1.1.1 |\n+| Versions | 2.5.x `[1]` | 4.4.22 | 1.6.3 | 1.1.1 |\nNOTES:\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/Chart.lock",
"new_path": "charts/harbor-operator/Chart.lock",
"diff": "dependencies:\n- name: operator\nrepository: https://operator.min.io/\n- version: 4.4.16\n+ version: 4.4.22\n- name: redis-operator\nrepository: https://spotahome.github.io/redis-operator\nversion: 3.1.4\n- name: postgres-operator\nrepository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator\nversion: 1.6.3\n-digest: sha256:c7386e79c639c546246a5ce9c52b3249e35af83bbd0eb5d497acac5a077df32a\n-generated: \"2022-05-12T22:05:05.865860016+08:00\"\n+digest: sha256:0325088de94fe9215f4201f67db9642c51dcdcc65697775b97dfda7a79542bfd\n+generated: \"2022-06-09T23:31:58.422674+08:00\"\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/Chart.yaml",
"new_path": "charts/harbor-operator/Chart.yaml",
"diff": "@@ -21,7 +21,7 @@ icon: https://branding.cncf.io/img/projects/harbor/icon/color/harbor-icon-color.\ndependencies:\n- name: operator\n- version: 4.4.16\n+ version: 4.4.22\ncondition: minio-operator.enabled\nrepository: https://operator.min.io/\ntags:\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/installation/kustomization-custom.md",
"new_path": "docs/installation/kustomization-custom.md",
"diff": "@@ -66,7 +66,7 @@ kubectl delete -f https://raw.githubusercontent.com/spotahome/redis-operator/mas\n## Deploy Minio operator (Optional)\n-Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.4.9#deploy-the-minio-operator-and-create-a-tenant) to install the Minio operator.\n+Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.4.22#deploy-the-minio-operator-and-create-a-tenant) to install the Minio operator.\nOr use the Minio kustomization template:\n@@ -74,7 +74,7 @@ Or use the Minio kustomization template:\n# Clone the codebase.\ngit clone https://github.com/minio/operator.git && \\\ncd operator && \\\n-git checkout tags/v4.4.9 -b minio-v4.4.9\n+git checkout tags/v4.4.22 -b minio-v4.4.22\n# Apply with the kustomization template that is located the root dir of the codebase.\nkustomize build | kubectl apply -f -\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -34427,9 +34427,13 @@ metadata:\ngoharbor.io/deploy-engine: Kustomization\ngoharbor.io/deploy-mode: cluster\ngoharbor.io/operator-version: v1.3.0\n+ meta.helm.sh/release-name: minio-operator\n+ meta.helm.sh/release-namespace: minio-operator\noperator.min.io/authors: MinIO, Inc.\noperator.min.io/license: AGPLv3\noperator.min.io/support: https://subnet.min.io\n+ labels:\n+ app.kubernetes.io/managed-by: Helm\nname: tenants.minio.min.io\nspec:\nconversion:\n@@ -38167,6 +38171,14 @@ spec:\ntype: array\ntype: object\ntype: object\n+ annotations:\n+ additionalProperties:\n+ type: string\n+ type: object\n+ labels:\n+ additionalProperties:\n+ type: string\n+ type: object\nname:\ntype: string\nnodeSelector:\n@@ -38192,6 +38204,68 @@ spec:\nx-kubernetes-int-or-string: true\ntype: object\ntype: object\n+ securityContext:\n+ properties:\n+ fsGroup:\n+ format: int64\n+ type: integer\n+ fsGroupChangePolicy:\n+ type: string\n+ runAsGroup:\n+ format: int64\n+ type: integer\n+ runAsNonRoot:\n+ type: boolean\n+ runAsUser:\n+ format: int64\n+ type: integer\n+ seLinuxOptions:\n+ properties:\n+ level:\n+ type: string\n+ role:\n+ type: string\n+ type:\n+ type: string\n+ user:\n+ type: string\n+ type: object\n+ seccompProfile:\n+ properties:\n+ localhostProfile:\n+ type: string\n+ type:\n+ type: string\n+ required:\n+ - type\n+ type: object\n+ supplementalGroups:\n+ items:\n+ format: int64\n+ type: integer\n+ type: array\n+ sysctls:\n+ items:\n+ properties:\n+ name:\n+ type: string\n+ value:\n+ type: string\n+ required:\n+ - name\n+ - value\n+ type: object\n+ type: array\n+ windowsOptions:\n+ properties:\n+ gmsaCredentialSpec:\n+ type: string\n+ gmsaCredentialSpecName:\n+ type: string\n+ runAsUserName:\n+ type: string\n+ type: object\n+ type: object\nservers:\nformat: int32\ntype: integer\n@@ -38211,6 +38285,45 @@ spec:\ntype: string\ntype: object\ntype: array\n+ topologySpreadConstraints:\n+ items:\n+ properties:\n+ labelSelector:\n+ properties:\n+ matchExpressions:\n+ items:\n+ properties:\n+ key:\n+ type: string\n+ operator:\n+ type: string\n+ values:\n+ items:\n+ type: string\n+ type: array\n+ required:\n+ - key\n+ - operator\n+ type: object\n+ type: array\n+ matchLabels:\n+ additionalProperties:\n+ type: string\n+ type: object\n+ type: object\n+ maxSkew:\n+ format: int32\n+ type: integer\n+ topologyKey:\n+ type: string\n+ whenUnsatisfiable:\n+ type: string\n+ required:\n+ - maxSkew\n+ - topologyKey\n+ - whenUnsatisfiable\n+ type: object\n+ type: array\nvolumeClaimTemplate:\nproperties:\napiVersion:\n@@ -38417,6 +38530,21 @@ spec:\nrawUsage:\nformat: int64\ntype: integer\n+ tiers:\n+ items:\n+ properties:\n+ Name:\n+ type: string\n+ Type:\n+ type: string\n+ totalSize:\n+ format: int64\n+ type: integer\n+ required:\n+ - Name\n+ - totalSize\n+ type: object\n+ type: array\nusage:\nformat: int64\ntype: integer\n@@ -38606,6 +38734,8 @@ spec:\ntype: boolean\ndomains:\nproperties:\n+ console:\n+ type: string\nminio:\nitems:\ntype: string\n@@ -42634,6 +42764,21 @@ spec:\nrawUsage:\nformat: int64\ntype: integer\n+ tiers:\n+ items:\n+ properties:\n+ Name:\n+ type: string\n+ Type:\n+ type: string\n+ totalSize:\n+ format: int64\n+ type: integer\n+ required:\n+ - Name\n+ - totalSize\n+ type: object\n+ type: array\nusage:\nformat: int64\ntype: integer\n@@ -50576,6 +50721,7 @@ rules:\n- \"\"\nresources:\n- namespaces\n+ - nodes\nverbs:\n- get\n- watch\n@@ -50651,6 +50797,7 @@ rules:\n- kubernetes.io/legacy-unknown\n- kubernetes.io/kube-apiserver-client\n- kubernetes.io/kubelet-serving\n+ - beta.eks.amazonaws.com/app-serving\nresources:\n- signers\nverbs:\n@@ -51693,6 +51840,21 @@ metadata:\nnamespace: harbor-operator-ns\n---\napiVersion: v1\n+kind: Secret\n+metadata:\n+ annotations:\n+ goharbor.io/deploy-engine: Kustomization\n+ goharbor.io/deploy-mode: cluster\n+ goharbor.io/operator-version: v1.3.0\n+ kubernetes.io/service-account.name: console-sa\n+ operator.min.io/authors: MinIO, Inc.\n+ operator.min.io/license: AGPLv3\n+ operator.min.io/support: https://subnet.min.io\n+ name: console-sa-secret\n+ namespace: harbor-operator-ns\n+type: kubernetes.io/service-account-token\n+---\n+apiVersion: v1\nkind: Service\nmetadata:\nannotations:\n@@ -51710,6 +51872,8 @@ spec:\nports:\n- name: https\nport: 4222\n+ - name: http\n+ port: 4221\nselector:\nname: minio-operator\noperator: leader\n@@ -51880,7 +52044,7 @@ spec:\n- minio-operator\ntopologyKey: kubernetes.io/hostname\ncontainers:\n- - image: quay.io/minio/operator:v4.4.9\n+ - image: quay.io/minio/operator:v4.4.22\nimagePullPolicy: IfNotPresent\nname: minio-operator\nresources:\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -18,7 +18,7 @@ resources:\n- https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.1 # redis operator\n- https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.1 # redis operator crd\n- github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator\n- - github.com/minio/operator?ref=v4.4.9 # minIO storage operator\n+ - github.com/minio/operator?ref=v4.4.22 # minIO storage operator\n# If you have to override the image source, uncomment this patch and also change the image source in the patch/image-source.yaml file.\n# Then rebuild.\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
update minio 4.4.22
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,875
|
15.06.2022 08:50:22
| -28,800
|
bfe5f35aa1008a5d6b9a5642a961f35f74a667cc
|
release v1.3.0-rc3
|
[
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/README.md",
"new_path": "charts/harbor-operator/README.md",
"diff": "@@ -37,7 +37,7 @@ Deploy Harbor Operator\n| harborClass | string | `\"\"` | Class name of the Harbor operator |\n| image.pullPolicy | string | `\"IfNotPresent\"` | The image pull policy for the controller. |\n| image.repository | string | `\"goharbor/harbor-operator\"` | The image repository whose default is the chart appVersion. |\n-| image.tag | string | `\"v1.3.0-rc1\"` | The image tag whose default is the chart appVersion. |\n+| image.tag | string | `\"v1.3.0-rc3\"` | The image tag whose default is the chart appVersion. |\n| imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when pulling images <https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/> For example: `[ {\"name\":\"image-pull-secret\"} ]` |\n| installCRDs | bool | `false` | If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED |\n| leaderElection.namespace | string | `\"kube-system\"` | The namespace used to store the ConfigMap for leader election |\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/values.yaml",
"new_path": "charts/harbor-operator/values.yaml",
"diff": "@@ -4,7 +4,7 @@ image:\n# image.pullPolicy -- The image pull policy for the controller.\npullPolicy: IfNotPresent\n# image.tag -- The image tag whose default is the chart appVersion.\n- tag: \"v1.3.0-rc1\"\n+ tag: \"v1.3.0-rc3\"\n# installCRDs -- If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED\ninstallCRDs: false\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -51950,7 +51950,7 @@ spec:\nfieldPath: metadata.namespace\n- name: CONFIGURATION_FROM\nvalue: env,file:/etc/harbor-operator/config.yaml\n- image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc1\n+ image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc3\nlivenessProbe:\nhttpGet:\npath: /healthz\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -47,4 +47,4 @@ images:\nnewName: ghcr.io/goharbor/postgres-operator\n- name: goharbor/harbor-operator\nnewName: ghcr.io/goharbor/harbor-operator\n- newTag: v1.3.0-rc1\n+ newTag: v1.3.0-rc3\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/deployment.yaml",
"new_path": "manifests/harbor/deployment.yaml",
"diff": "@@ -39896,7 +39896,7 @@ spec:\nfieldPath: metadata.namespace\n- name: CONFIGURATION_FROM\nvalue: env,file:/etc/harbor-operator/config.yaml\n- image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc1\n+ image: ghcr.io/goharbor/harbor-operator:v1.3.0-rc3\nlivenessProbe:\nhttpGet:\npath: /healthz\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/kustomization.yaml",
"new_path": "manifests/harbor/kustomization.yaml",
"diff": "@@ -23,4 +23,4 @@ resources:\nimages:\n- name: goharbor/harbor-operator\nnewName: ghcr.io/goharbor/harbor-operator\n- newTag: v1.3.0-rc1\n\\ No newline at end of file\n+ newTag: v1.3.0-rc3\n\\ No newline at end of file\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
release v1.3.0-rc3
Signed-off-by: Ziming Zhang <zziming@vmware.com>
|
254,890
|
22.06.2022 20:16:36
| -28,800
|
9164d7f24b6e9cd142847de88be6f50cb5172f57
|
fix: Ignore the status check for the registryctl cr in harbor controller
|
[
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/registryctl.go",
"new_path": "controllers/goharbor/harbor/registryctl.go",
"diff": "@@ -25,7 +25,7 @@ func (r *Reconciler) AddRegistryController(ctx context.Context, harbor *goharbor\nreturn nil, nil, errors.Wrap(err, \"cannot get registryCtl\")\n}\n- registryCtlRes, err := r.AddBasicResource(ctx, registryCtl, certificate)\n+ registryCtlRes, err := r.AddNonCheckableResource(ctx, registryCtl, certificate)\nif err != nil {\nreturn nil, nil, errors.Wrap(err, \"cannot add registryCtl\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/registry/registryctl.go",
"new_path": "controllers/goharbor/registry/registryctl.go",
"diff": "@@ -88,11 +88,3 @@ func owneredByRegistryCtl(obj client.Object, registryCtl *goharborv1.RegistryCon\nreturn false\n}\n-\n-// UpdateRegistryCtlStatus updates registrycontroller status by registry.\n-func (r *Reconciler) UpdateRegistryCtlStatus(ctx context.Context, registry *goharborv1.Registry, registryCtl *goharborv1.RegistryController) error {\n- // sync registrycontroller status with registry\n- registryCtl.Status = registry.Status\n-\n- return r.Client.Status().Update(ctx, registryCtl)\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/registry/resources.go",
"new_path": "controllers/goharbor/registry/resources.go",
"diff": "@@ -33,13 +33,6 @@ func (r *Reconciler) AddResources(ctx context.Context, resource resources.Resour\nreturn errors.Wrap(err, \"cannot get registryctl\")\n}\n- defer func() {\n- e := r.UpdateRegistryCtlStatus(ctx, registry, registryCtl)\n- if e != nil {\n- r.Log.Error(err, \"cannot update registry controller status\")\n- }\n- }()\n-\nerr = r.CleanUpRegistryCtlResources(ctx, registryCtl)\nif err != nil {\nreturn errors.Wrap(err, \"cleanup registryctl resources error\")\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/resource.go",
"new_path": "pkg/controller/resource.go",
"diff": "@@ -299,6 +299,30 @@ func (c *Controller) AddBasicResource(ctx context.Context, resource resources.Re\nreturn res, g.AddResource(ctx, res, dependencies, c.ProcessFunc(ctx, resource, dependencies...))\n}\n+func (c *Controller) AddNonCheckableResource(ctx context.Context, resource resources.Resource, dependencies ...graph.Resource) (*Resource, error) {\n+ if resource == nil {\n+ return nil, nil\n+ }\n+\n+ mutate, err := c.GlobalMutateFn(ctx)\n+ if err != nil {\n+ return nil, err\n+ }\n+\n+ res := &Resource{\n+ mutable: mutate,\n+ checkable: statuscheck.True,\n+ resource: resource,\n+ }\n+\n+ g := sgraph.Get(ctx)\n+ if g == nil {\n+ return nil, errors.Errorf(\"no graph in current context\")\n+ }\n+\n+ return res, g.AddResource(ctx, res, dependencies, c.ProcessFunc(ctx, resource, dependencies...))\n+}\n+\nfunc (c *Controller) AddExternalResource(ctx context.Context, resource resources.Resource, dependencies ...graph.Resource) (graph.Resource, error) {\nif resource == nil {\nreturn nil, nil\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix: Ignore the status check for the registryctl cr in harbor controller (#918)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
|
254,868
|
27.06.2022 21:09:42
| -28,800
|
388203f49e9dab6b5c2ac276f519ab418dd8659a
|
fix: service template do not have namespace
|
[
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/templates/service.yaml",
"new_path": "charts/harbor-operator/templates/service.yaml",
"diff": "@@ -2,6 +2,7 @@ apiVersion: v1\nkind: Service\nmetadata:\nname: {{ include \"chart.fullname\" . }}\n+ namespace: {{ .Release.Namespace | quote }}\nlabels:\n{{- include \"chart.labels\" . | nindent 4 }}\nspec:\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix: service template do not have namespace (#916)
Signed-off-by: colin <kunyao.li@matrixport.com>
Co-authored-by: colin <kunyao.li@matrixport.com>
|
254,893
|
27.06.2022 20:58:11
| -28,800
|
765bf5860aa72a632bd907d9156fe005a738399e
|
doc(tutorial): add warnings for ingress class
|
[
{
"change_type": "MODIFY",
"old_path": "docs/tutorial.md",
"new_path": "docs/tutorial.md",
"diff": "# Tutorial\n-This tutorial will guides you to have a quick first try of the Harbor operator and the Harbor cluster deployed and managed by the operator.\n+This tutorial will guide you to have a quick first try of the Harbor operator and the Harbor cluster deployed and managed by the operator.\n## Learn how does it work\n@@ -10,7 +10,7 @@ If you want to learn the overall design of the Harbor operator before starting t\nCheck the prerequisites and install the Harbor operator base on your needs by following the [installation guide](./installation/installation.md).\n-Before moving on, make sure the harbor operator is successfully deployed in the Kubenetes cluster.\n+Before moving on, make sure the harbor operator is successfully deployed in the Kubernetes cluster.\n```shell\n~/harbor-operator$ kubectl get all -n harbor-operator-ns\n@@ -45,9 +45,13 @@ To deploy a Harbor cluster, you need to prepare a deployment manifest first. For\nLearn more about the sample manifests, you can check [manifests reference](./manifests-reference.md#manifestssamples).\n-> NOTES: to allow the deployed Harbor cluster to be accessible outside the Kubenetes cluster, make sure the ingress hosts and host in the `externalURL` should be mapping with accessible IPs in the /etc/hosts (for local development environments) or can be resolved and accessible by DNS resolver.\n+**NOTES:**\n+>To allow the deployed Harbor cluster to be accessible outside the Kubernetes cluster, make sure the ingress hosts and host in the `externalURL` should be mapping with accessible IPs in the /etc/hosts (for local development environments) or can be resolved and accessible by DNS resolver.\n>TIPS: for local development, some plan-domain services like `sub-domain.<IP>.nip.io` can be used to provide simple public accessible hosts.\n+**ATTENTIONS:**\n+>To deploy Harbor cluster, you have to make sure a [default ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#default-ingress-class) is marked in your cluster, otherwise, you need to explicitly set the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class) through the `ingressClassName` field of the `ingress` configuration. e.g. `spec.expose.core.ingress.ingressClassName`. For details, you can refer to the [CRD spec](./CRD/custom-resource-definition.md).\n+\nHere we clone the [full stack sample manifest](../manifests/samples/full_stack.yaml) as an example and modify the external host and ingress hosts with `sub-domain.<IP>.nip.io` pattern. Modified content is shown as below. Please pay attention here, the 'namespace', 'admin core secret', 'minio access secret' and 'cert-manager issuer/certificate/key' are pre-defined resources and bound to the deploying Harbor cluster.\n`my_full_stack.yaml`:\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
doc(tutorial): add warnings for ingress class
Signed-off-by: Steven Zou <szou@vmware.com>
|
254,891
|
07.09.2022 17:44:56
| -28,800
|
72f3363975c108fbaf602119fc54d76ac0ebe33f
|
change kubectl apply
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/tests.yml",
"new_path": ".github/workflows/tests.yml",
"diff": "@@ -205,7 +205,7 @@ jobs:\nkustomize edit add secret github-token --disableNameSuffixHash --from-literal=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}\nkustomize edit add patch --path patch/github-token.yaml\nkustomize edit set image goharbor/harbor-operator=${dockerImage}\n- kustomize build | kubectl apply -f -\n+ kustomize build | kubectl create -f -\nif ! time kubectl -n ${operatorNamespace} wait --for=condition=Available deployment --all --timeout 300s; then\nkubectl get all -n ${operatorNamespace}\n@@ -420,7 +420,7 @@ jobs:\nkustomize edit add secret github-token --disableNameSuffixHash --from-literal=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}\nkustomize edit add patch --path patch/github-token.yaml\nkustomize edit set image goharbor/harbor-operator=${dockerImage}\n- kustomize build | kubectl apply -f -\n+ kustomize build | kubectl create -f -\nif ! time kubectl -n ${operatorNamespace} wait --for=condition=Available deployment --all --timeout 300s; then\nkubectl get all -n ${operatorNamespace}\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/kustomization.yaml",
"new_path": "manifests/cluster/kustomization.yaml",
"diff": "@@ -15,8 +15,8 @@ commonAnnotations:\nresources:\n- ../../config/default # harbor operator\n- patch/namespace.yaml\n- - https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.1 # redis operator\n- - https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.1 # redis operator crd\n+ - https://raw.githubusercontent.com/spotahome/redis-operator/v1.1.1/example/operator/all-redis-operator-resources.yaml # redis operator\n+ - https://raw.githubusercontent.com/spotahome/redis-operator/v1.1.1/manifests/databases.spotahome.com_redisfailovers.yaml # redis operator crd\n- github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator\n- github.com/minio/operator?ref=v4.4.28 # minIO storage operator\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
change kubectl apply (#960)
Signed-off-by: rongfu.leng <1275177125@qq.com>
|
254,867
|
15.11.2022 11:13:58
| 0
|
96bd0ef025dad8eccd4f23e62eba4c233db1561b
|
Update values for postgres authentication
|
[
{
"change_type": "MODIFY",
"old_path": "pkg/cluster/controllers/database/generate.go",
"new_path": "pkg/cluster/controllers/database/generate.go",
"diff": "@@ -95,6 +95,13 @@ func GetPgHba() []string {\nreturn []string{\n\"hostssl all all 0.0.0.0/0 md5\",\n\"host all all 0.0.0.0/0 md5\",\n+ \"local all all trust\",\n+ \"local replication postgres trust\",\n+ \"hostssl replication postgres all md5\",\n+ \"local replication standby trust\",\n+ \"hostssl replication standby all md5\",\n+ \"hostssl all +zalandos all pam\",\n+ \"hostssl all all all md5\",\n}\n}\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
Update values for postgres authentication
Signed-off-by: William Young <will.young@engineerbetter.com>
|
254,866
|
25.10.2022 15:14:14
| -7,200
|
ed9b4f6f1c60ade1fcc7092c2ab475d856a7f28c
|
Fix go-dependencies-test
|
[
{
"change_type": "MODIFY",
"old_path": "go.mod",
"new_path": "go.mod",
"diff": "@@ -34,7 +34,6 @@ require (\ngithub.com/zalando/postgres-operator v1.6.1\ngo.uber.org/zap v1.19.1\ngolang.org/x/crypto v0.0.0-20210921155107-089bfa567519\n- golang.org/x/exp v0.0.0-20221012211006-4de253d81b95\ngolang.org/x/sync v0.0.0-20210220032951-036812b2e83c\ngopkg.in/yaml.v2 v2.4.0\nk8s.io/api v0.23.0\n"
},
{
"change_type": "MODIFY",
"old_path": "go.sum",
"new_path": "go.sum",
"diff": "@@ -1506,8 +1506,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0\ngolang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=\ngolang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=\ngolang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=\n-golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 h1:sBdrWpxhGDdTAYNqbgBLAR+ULAPPhfgncLr1X0lyWtg=\n-golang.org/x/exp v0.0.0-20221012211006-4de253d81b95/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=\ngolang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=\ngolang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=\ngolang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
GH-969: Fix go-dependencies-test
Signed-off-by: Joan Miquel Luque Oliver <joan.luque@dynatrace.com>
|
254,873
|
04.11.2022 06:16:23
| 0
|
30d6d29adf270135fd423a1b1841b644909ea46a
|
fix: make expose core ingress optional
|
[
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1alpha3/harborcluster_conversion.go",
"new_path": "apis/goharbor.io/v1alpha3/harborcluster_conversion.go",
"diff": "@@ -356,7 +356,8 @@ func Convert_v1alpha3_HarborExposeSpec_To_v1beta1_HarborExposeSpec(src *HarborEx\nfunc Convert_v1alpha3_HarborExposeComponentSpec_To_v1beta1_HarborExposeComponentSpec(src *HarborExposeComponentSpec, dst *v1beta1.HarborExposeComponentSpec) { //nolint\nif src.Ingress != nil {\n- Convert_v1alpha3_HarborExposeIngressSpec_To_v1beta1_HarborExposeIngressSpec(src.Ingress, &dst.Ingress)\n+ dst.Ingress = &v1beta1.HarborExposeIngressSpec{}\n+ Convert_v1alpha3_HarborExposeIngressSpec_To_v1beta1_HarborExposeIngressSpec(src.Ingress, dst.Ingress)\n}\nif src.TLS != nil {\n@@ -755,8 +756,10 @@ func Convert_v1beta1_HarborExposeSpec_To_v1alpha3_HarborExposeSpec(src *v1beta1.\n}\nfunc Convert_v1beta1_HarborExposeComponentSpec_To_v1alpha3_HarborExposeComponentSpec(src *v1beta1.HarborExposeComponentSpec, dst *HarborExposeComponentSpec) { //nolint\n+ if src.Ingress != nil {\ndst.Ingress = &HarborExposeIngressSpec{}\n- Convert_v1beta1_HarborExposeIngressSpec_To_v1alpha3_HarborExposeIngressSpec(&src.Ingress, dst.Ingress)\n+ Convert_v1beta1_HarborExposeIngressSpec_To_v1alpha3_HarborExposeIngressSpec(src.Ingress, dst.Ingress)\n+ }\nif src.TLS != nil {\ndst.TLS = src.TLS\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/harbor_types.go",
"new_path": "apis/goharbor.io/v1beta1/harbor_types.go",
"diff": "@@ -741,8 +741,8 @@ type HarborExposeComponentSpec struct {\n// +kubebuilder:validation:Optional\nTLS *harbormetav1.ComponentsTLSSpec `json:\"tls,omitempty\"`\n- // +kubebuilder:validation:Required\n- Ingress HarborExposeIngressSpec `json:\"ingress\"`\n+ // +kubebuilder:validation:Optional\n+ Ingress *HarborExposeIngressSpec `json:\"ingress,omitempty\"`\n}\ntype HarborExposeIngressSpec struct {\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/harborcluster_webhook.go",
"new_path": "apis/goharbor.io/v1beta1/harborcluster_webhook.go",
"diff": "@@ -229,8 +229,8 @@ func (harborcluster *HarborCluster) validateStorage() *field.Error { //nolint:go\n}\nif redirect != nil && redirect.Enable {\n- if redirect.Expose == nil {\n- return required(rp.Child(\"expose\"))\n+ if redirect.Expose == nil || redirect.Expose.Ingress == nil {\n+ return required(rp.Child(\"ingress\"))\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"new_path": "apis/goharbor.io/v1beta1/zz_generated.deepcopy.go",
"diff": "@@ -1856,7 +1856,11 @@ func (in *HarborExposeComponentSpec) DeepCopyInto(out *HarborExposeComponentSpec\n*out = new(v1alpha1.ComponentsTLSSpec)\n**out = **in\n}\n- in.Ingress.DeepCopyInto(&out.Ingress)\n+ if in.Ingress != nil {\n+ in, out := &in.Ingress, &out.Ingress\n+ *out = new(HarborExposeIngressSpec)\n+ (*in).DeepCopyInto(*out)\n+ }\n}\n// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HarborExposeComponentSpec.\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/harbor-operator/templates/crds.yaml",
"new_path": "charts/harbor-operator/templates/crds.yaml",
"diff": "@@ -9693,8 +9693,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -9728,8 +9726,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n@@ -10786,8 +10782,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -11195,8 +11189,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -14693,8 +14685,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -14728,8 +14718,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/core.go",
"new_path": "controllers/goharbor/harbor/core.go",
"diff": "@@ -405,7 +405,9 @@ func (r *Reconciler) GetCore(ctx context.Context, harbor *goharborv1.Harbor) (*g\nharbormetav1.NetworkPoliciesAnnotationName: harbormetav1.NetworkPoliciesAnnotationDisabled,\n}\n+ if harbor.Spec.Expose.Core.Ingress != nil {\nannotation[harbormetav1.IngressControllerAnnotationName] = string(harbor.Spec.Expose.Core.Ingress.Controller)\n+ }\nreturn &goharborv1.Core{\nObjectMeta: metav1.ObjectMeta{\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/ingresses.go",
"new_path": "controllers/goharbor/harbor/ingresses.go",
"diff": "@@ -32,6 +32,10 @@ func (r *Reconciler) AddCoreIngress(ctx context.Context, harbor *goharborv1.Harb\n}\nfunc (r *Reconciler) GetCoreIngress(ctx context.Context, harbor *goharborv1.Harbor) (*netv1.Ingress, error) {\n+ if harbor.Spec.Expose.Core.Ingress == nil {\n+ return nil, nil\n+ }\n+\nvar tls []netv1.IngressTLS\nif harbor.Spec.Expose.Core.TLS.Enabled() {\n@@ -113,7 +117,7 @@ func (r *Reconciler) GetNotaryServerIngress(ctx context.Context, harbor *goharbo\nreturn nil, nil\n}\n- if harbor.Spec.Expose.Notary == nil {\n+ if harbor.Spec.Expose.Notary.Ingress == nil {\nreturn nil, nil\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/notaryserver.go",
"new_path": "controllers/goharbor/harbor/notaryserver.go",
"diff": "@@ -195,7 +195,9 @@ func (r *Reconciler) GetNotaryServer(ctx context.Context, harbor *goharborv1.Har\nharbormetav1.NetworkPoliciesAnnotationName: harbormetav1.NetworkPoliciesAnnotationDisabled,\n}\n+ if harbor.Spec.Expose.Core.Ingress != nil {\nannotation[harbormetav1.IngressControllerAnnotationName] = string(harbor.Spec.Expose.Core.Ingress.Controller)\n+ }\nreturn &goharborv1.NotaryServer{\nObjectMeta: metav1.ObjectMeta{\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor/portal.go",
"new_path": "controllers/goharbor/harbor/portal.go",
"diff": "@@ -59,7 +59,9 @@ func (r *Reconciler) GetPortal(ctx context.Context, harbor *goharborv1.Harbor) (\nharbormetav1.NetworkPoliciesAnnotationName: harbormetav1.NetworkPoliciesAnnotationDisabled,\n}\n+ if harbor.Spec.Expose.Core.Ingress != nil {\nannotation[harbormetav1.IngressControllerAnnotationName] = string(harbor.Spec.Expose.Core.Ingress.Controller)\n+ }\nreturn &goharborv1.Portal{\nObjectMeta: metav1.ObjectMeta{\n"
},
{
"change_type": "MODIFY",
"old_path": "controllers/goharbor/harbor_test.go",
"new_path": "controllers/goharbor/harbor_test.go",
"diff": "@@ -147,15 +147,6 @@ func setupValidHarbor(ctx context.Context, ns string) (Resource, client.ObjectKe\nExternalURL: publicURL.String(),\nHarborAdminPasswordRef: adminSecretName,\nVersion: test.GetVersion(),\n- Expose: goharborv1.HarborExposeSpec{\n- Core: goharborv1.HarborExposeComponentSpec{\n- TLS: nil,\n- Ingress: goharborv1.HarborExposeIngressSpec{\n- Host: \"core.goharbor.io\",\n- },\n- },\n- Notary: nil,\n- },\nImageChartStorage: &goharborv1.HarborStorageImageChartStorageSpec{\nFileSystem: &goharborv1.HarborStorageImageChartStorageFileSystemSpec{\nRegistryPersistentVolume: goharborv1.HarborStorageRegistryPersistentVolumeSpec{\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -9712,8 +9712,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -9747,8 +9745,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n@@ -10805,8 +10801,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -11214,8 +11208,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -14717,8 +14709,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -14752,8 +14742,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n"
},
{
"change_type": "MODIFY",
"old_path": "manifests/harbor/deployment.yaml",
"new_path": "manifests/harbor/deployment.yaml",
"diff": "@@ -9712,8 +9712,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -9747,8 +9745,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n@@ -10805,8 +10801,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -11214,8 +11208,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- enable\n@@ -14717,8 +14709,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nnotary:\ndescription: The ingress of the notary, required when notary component\n@@ -14752,8 +14742,6 @@ spec:\npattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\ntype: string\ntype: object\n- required:\n- - ingress\ntype: object\nrequired:\n- core\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cluster/controllers/storage/ingress.go",
"new_path": "pkg/cluster/controllers/storage/ingress.go",
"diff": "@@ -31,8 +31,8 @@ func (m *MinIOController) applyIngress(ctx context.Context, harborcluster *gohar\nm.Log.Info(\"Redirect of MinIO is not enabled\")\nreturn m.cleanupIngress(ctx, harborcluster)\n- } else if redirect.Expose == nil {\n- err := errors.New(\"Expose should be defined when redirect enabled\")\n+ } else if redirect.Expose == nil || redirect.Expose.Ingress == nil {\n+ err := errors.New(\"Expose.Ingress should be defined when redirect enabled\")\nreturn minioNotReadyStatus(UpdateIngressError, err.Error()), err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cluster/controllers/storage/tenant.go",
"new_path": "pkg/cluster/controllers/storage/tenant.go",
"diff": "@@ -82,8 +82,8 @@ func (m *MinIOController) getMinIOProperties(ctx context.Context, harborcluster\nif redirect != nil && redirect.Enable {\nstorageSpec.Redirect.Disable = false\n- if redirect.Expose == nil {\n- return nil, errors.New(\"Expose should be defined when redirect enabled\")\n+ if redirect.Expose == nil || redirect.Expose.Ingress == nil {\n+ return nil, errors.New(\"Expose.Ingress should be defined when redirect enabled\")\n}\ntls = redirect.Expose.TLS\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
fix: make expose core ingress optional
https://github.com/goharbor/harbor-operator/issues/955
Signed-off-by: Shou-En Hsiao <shouenhsiao@google.com>
|
254,867
|
16.11.2022 09:52:13
| 0
|
ba52662f1ff63df3be9d665e0fbbf6713cc9ffdf
|
Update spilo version
|
[
{
"change_type": "MODIFY",
"old_path": "pkg/image/components.go",
"new_path": "pkg/image/components.go",
"diff": "@@ -128,8 +128,8 @@ func init() { //nolint:gochecknoinits\nRegisterTag(\"cluster-redis\", \"5.0-alpine\", \"~2.2.0\", \"~2.3.0\", \"~2.4.0\", \"~2.5.0\", \"~2.6.0\")\nRegisterRepository(\"cluster-postgresql\", \"registry.opensource.zalan.do/acid\", \"*\")\n- RegisterImageName(\"cluster-postgresql\", \"spilo-12\", \"*\")\n- RegisterTag(\"cluster-postgresql\", \"1.6-p3\", \"~2.2.0\", \"~2.3.0\", \"~2.4.0\", \"~2.5.0\", \"~2.6.0\")\n+ RegisterImageName(\"cluster-postgresql\", \"spilo-14\", \"*\")\n+ RegisterTag(\"cluster-postgresql\", \"2.1-p7\", \"~2.2.0\", \"~2.3.0\", \"~2.4.0\", \"~2.5.0\")\nRegisterRepository(\"cluster-minio\", \"minio\", \"*\") // the minio repository of dockerhub\nRegisterImageName(\"cluster-minio\", \"minio\", \"*\")\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
Update spilo version
Signed-off-by: William Young <will.young@engineerbetter.com>
|
254,867
|
17.11.2022 09:06:21
| 0
|
ab22239f8872b31aab56d2d56dd6712a3e95dddd
|
Update Spilo tests and deployment
|
[
{
"change_type": "MODIFY",
"old_path": "manifests/cluster/deployment.yaml",
"new_path": "manifests/cluster/deployment.yaml",
"diff": "@@ -63761,7 +63761,7 @@ data:\ndebug_logging: \"true\"\ndefault_cpu_request: 250m\ndefault_memory_request: 500Mi\n- docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p7\n+ docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p7\nenable_ebs_gp3_migration: \"false\"\nenable_master_load_balancer: \"false\"\nenable_pgversion_env_var: \"true\"\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/image/image_test.go",
"new_path": "pkg/image/image_test.go",
"diff": "@@ -134,7 +134,7 @@ var _ = Describe(\"Get image\", func() {\nIt(\"Should pass\", func() {\nimage, err := getImage(ctx, \"cluster-postgresql\")\nExpect(err).ToNot(HaveOccurred())\n- Expect(image).To(Equal(\"registry.opensource.zalan.do/acid/spilo-12:1.6-p3\"))\n+ Expect(image).To(Equal(\"registry.opensource.zalan.do/acid/spilo-14:2.1-p7\"))\n})\n})\n@@ -142,7 +142,7 @@ var _ = Describe(\"Get image\", func() {\nIt(\"Should pass\", func() {\nimage, err := getImage(ctx, \"cluster-postgresql\", WithRepository(\"ghcr.io/goharbor\"))\nExpect(err).ToNot(HaveOccurred())\n- Expect(image).To(Equal(\"ghcr.io/goharbor/spilo-12:1.6-p3\"))\n+ Expect(image).To(Equal(\"ghcr.io/goharbor/spilo-14:2.1-p7\"))\n})\n})\n})\n"
}
] |
Go
|
Apache License 2.0
|
goharbor/harbor-operator
|
Update Spilo tests and deployment
Signed-off-by: William Young <will.young@engineerbetter.com>
|
603,652
|
11.11.2019 13:41:04
| -10,800
|
b396d42cd2b9e5fb5a373e9d357dc2c9c751b419
|
Add CI setup
Add CI that does `reuse lint` and build `tezos-client` along with its
`.rpm` and `.deb` packages
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".buildkite/check-trailing-whitespace.sh",
"diff": "+#!/usr/bin/env bash\n+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+files=$(git ls-files -- . ':!:*.patch' | xargs grep --files-with-matches --binary-files=without-match '[[:blank:]]$')\n+if [[ ! -z $files ]];then\n+ echo ' Files with trailing whitespace found:'\n+ for f in \"${files[@]}\"; do\n+ echo \" * $f\"\n+ done\n+ exit 1\n+fi\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".buildkite/pipeline.yml",
"diff": "+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+env:\n+ NIX_PATH: nixpkgs=channel:nixos-unstable\n+\n+steps:\n+ - command: nix run nixpkgs.reuse -c reuse lint\n+ label: reuse lint\n+ - command: .buildkite/check-trailing-whitespace.sh\n+ label: check trailing whitespace\n+ - command: \"nix run -f https://github.com/serokell/crossref-verifier/archive/master.tar.gz -c crossref-verify\"\n+ label: crossref-verify\n+ soft_fail: true\n+ - commands:\n+ - nix-build -A tezos-client-static -o tezos-client-static\n+ - nix-build -A tezos-client-rpm-package -o tezos-client-rpm\n+ - nix-build -A tezos-client-deb-package -o tezos-client-deb\n+ label: build and package\n+ artifact_paths:\n+ - ./tezos-client-static/bin/tezos-client\n+ - ./tezos-client-rpm/*\n+ - ./tezos-client-deb/*\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".crossref-verifier.yaml",
"diff": "+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+#\n+# Parameters of repository traversal.\n+traversal:\n+ # Folders which we pretend do not exist\n+ # (so they are neither analyzed nor can be referenced).\n+ ignored:\n+ # Git files\n+ - .git\n+\n+# Verification parameters.\n+verification:\n+ # On 'anchor not found' error, how much similar anchors should be displayed as hint.\n+ # Number should be between 0 and 1, larger value means stricter filter.\n+ anchorSimilarityThreshold: 0.5\n+\n+ # When checking external references, how long to wait on request before\n+ # declaring \"Response timeout\".\n+ externalRefCheckTimeout: 10s\n+\n+ # File prefixes, references in which should not be analyzed.\n+ notScanned:\n+ # Github-specific files\n+ - .github/pull_request_template.md\n+\n+ # Glob patterns describing the files which do not physically exist in the repository\n+ # but should be treated as existing nevertheless.\n+ virtualFiles:\n+ # Github pages\n+ - ../../issues\n+ - ../../issues/*\n+ - ../../pulls\n+ - ../../pulls/*\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "# `tezos-client`\n+[](https://buildkite.com/serokell/tezos-client)\n+\n`tezos-client` is CLI tool used for interaction with Tezos blockchain.\nThis repo contains nix expression for building staticically linked\ntezos-client binaries that can be used with remote tezos nodes without\n@@ -19,6 +21,12 @@ to build staticically linked `tezos-client` executable.\nRun `nix-build -A tezos-client-{rpm, deb}-package -o tezos-client-package` in order\nto build native `.rpm` or `.deb` package for RedHat and Debiab-based distros.\n+## Obtain binary or packages from CI\n+\n+If you don't want to build these files from scratch, you can download artifacts\n+produced by the CI. Go to the [master builds](https://buildkite.com/serokell/tezos-client/builds?branch=master)\n+and download the artifacts from the `build and package` stage.\n+\n## `tezos-client` usage\nRun `tezos-client [global options] command [command options]`.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[TM-359] Add CI setup
Add CI that does `reuse lint` and build `tezos-client` along with its
`.rpm` and `.deb` packages
|
603,652
|
13.11.2019 12:08:05
| -10,800
|
d48d003b83e46e20fb914320ee78accebdea0c08
|
Update README
Problem: Obtain binary or packages from CI section in the README.md
isn't quite clear. Also there are some inaccuracies in this file.
Solution: Update README, also update `packageRpm.nix` because it
contained some incorrect stuff.
|
[
{
"change_type": "MODIFY",
"old_path": "packageRpm.nix",
"new_path": "packageRpm.nix",
"diff": "@@ -24,7 +24,7 @@ let\nVersion: ${majorVersion}.${minorVersion}\n%description\n- CLI executable that can be used for managing deployed TZBTC contract\n+ ${pkgDesc.description}\n%files\n/usr/local/bin/${project}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[TM-359] Update README
Problem: Obtain binary or packages from CI section in the README.md
isn't quite clear. Also there are some inaccuracies in this file.
Solution: Update README, also update `packageRpm.nix` because it
contained some incorrect stuff.
|
603,652
|
22.11.2019 11:52:54
| -10,800
|
0038905d9c3daa1812a01f01d7ed5fb3e59d1328
|
Change link to CI
Problem: Both repo and CI pipeline were renamed, however, README has
link to old pipeline (it still works, btw).
Solution: Update link to renamed buildkite pipeline.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -24,7 +24,7 @@ to build native `.rpm` or `.deb` package for Red Hat and Debian-based distros.\n## Obtain binary or packages from CI\nIf you don't want to build these files from scratch, you can download artifacts\n-produced by the CI. Go to the [latest master build](https://buildkite.com/serokell/tezos-client/builds/latest?branch=master),\n+produced by the CI. Go to the [latest master build](https://buildkite.com/serokell/tezos-client-packaging/builds/latest?branch=master),\nclick on `build and package` stage, choose `Artifacts` section and download files by clcking on the filenames.\n## Ubuntu (Debian based distros) usage\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#3] Change link to CI
Problem: Both repo and CI pipeline were renamed, however, README has
link to old pipeline (it still works, btw).
Solution: Update link to renamed buildkite pipeline.
|
603,652
|
15.11.2019 12:26:29
| -10,800
|
1d545e7dd72f49838037208f99e0ae56350c7c8b
|
Update package and binary names
Problem:
1) There is no actual versioning for tezos-client
2) We want to have binaries and packages for both mainnet and babylonnet
Solution:
1) Use timestamp in ISO 8601 and short git hash as a version
2) Produce required files in CI as well
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "env:\nNIX_PATH: nixpkgs=channel:nixos-unstable\n+ cur_date: \"$(date +\\\"%Y%m%d%H%M\\\")\"\nsteps:\n- command: nix run nixpkgs.reuse -c reuse lint\n@@ -14,11 +15,17 @@ steps:\nlabel: crossref-verify\nsoft_fail: true\n- commands:\n- - nix-build -A tezos-client-static -o tezos-client-static\n- - nix-build -A tezos-client-rpm-package -o tezos-client-rpm\n- - nix-build -A tezos-client-deb-package -o tezos-client-deb\n+ - nix-build -A tezos-client-mainnet -o tezos-client-mainnet\n+ - nix-build -A tezos-client-babylonnet -o tezos-client-babylonnet\n+ - nix-build -A mainnet-rpm-package -o mainnet-rpm-package --arg timestamp ${cur_date}\n+ - nix-build -A mainnet-deb-package -o mainnet-deb-package --arg timestamp ${cur_date}\n+ - nix-build -A babylonnet-rpm-package -o babylonnet-rpm-package --arg timestamp ${cur_date}\n+ - nix-build -A babylonnet-deb-package -o babylonnet-deb-package --arg timestamp ${cur_date}\nlabel: build and package\nartifact_paths:\n- - ./tezos-client-static/bin/tezos-client\n- - ./tezos-client-rpm/*\n- - ./tezos-client-deb/*\n+ - ./tezos-client-mainnet/*\n+ - ./tezos-client-babylonnet/*\n+ - ./mainnet-rpm-package/*\n+ - ./mainnet-deb-package/*\n+ - ./babylonnet-rpm-package/*\n+ - ./babylonnet-deb-package/*\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ pkgs ? import <nixpkgs> { } }:\n+{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\" }:\nwith pkgs;\nlet\nroot = ./.;\n- tezos-client-static = import ./nix/static.nix;\n- tezos-client-binary = \"${tezos-client-static}/bin/tezos-client\";\n- packageDesc = {\n- project = \"tezos-client\";\n- majorVersion = \"1\";\n- minorVersion = \"0\";\n- packageRevision = \"0\";\n- bin = tezos-client-binary;\n+ mainnet = {\n+ rev = \"94f779a7\";\n+ sha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\n+ patchFile = ./nix/fix-mainnet.patch;\n+ };\n+ babylonnet = {\n+ rev = \"b8731913\";\n+ sha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\n+ patchFile = ./nix/fix-babylonnet.patch;\n+ };\n+ tezos-client-static-mainnet = import ./nix/static.nix mainnet;\n+ tezos-client-static-babylonnet = import ./nix/static.nix babylonnet;\n+ binary-mainnet = \"${tezos-client-static-mainnet}/bin/tezos-client\";\n+ binary-babylonnet = \"${tezos-client-static-babylonnet}/bin/tezos-client\";\n+ packageDesc-mainnet = {\n+ project = \"tezos-client-mainnet\";\n+ version = toString timestamp;\n+ bin = binary-mainnet;\narch = \"amd64\";\nlicense = \"MPL-2.0\";\ndependencies = \"\";\nmaintainer = \"Serokell https://serokell.io\";\nlicenseFile = \"${root}/LICENSES/MPL-2.0.txt\";\ndescription = \"CLI client for interacting with tezos blockchain\";\n+ gitRevision = mainnet.rev;\n+ };\n+\n+ packageDesc-babylonnet = packageDesc-mainnet // {\n+ project = \"tezos-client-babylonnet\";\n+ bin = binary-babylonnet;\n+ gitRevision = babylonnet.rev;\n};\n- buildDeb =\n- import ./packageDeb.nix { inherit stdenv writeTextFile; } packageDesc;\n- buildRpm = import ./packageRpm.nix { inherit stdenv writeTextFile; }\n+\n+ buildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile; };\n+ buildRpm = packageDesc:\n+ import ./packageRpm.nix { inherit stdenv writeTextFile; }\n(packageDesc // { arch = \"x86_64\"; });\ninherit (vmTools)\n@@ -31,13 +49,41 @@ let\nrunInLinuxImage;\nubuntuImage = makeImageFromDebDist debDistros.ubuntu1804x86_64;\nfedoraImage = makeImageFromRPMDist rpmDistros.fedora27x86_64;\n- tezos-client-rpm-package =\n- runInLinuxImage (buildRpm.packageRpm // { diskImage = fedoraImage; });\n- tezos-client-deb-package =\n- runInLinuxImage (buildDeb.packageDeb // { diskImage = ubuntuImage; });\n+ mainnet-rpm-package = runInLinuxImage\n+ ((buildRpm packageDesc-mainnet).packageRpm // { diskImage = fedoraImage; });\n-in rec {\n- inherit tezos-client-static tezos-client-rpm-package tezos-client-deb-package;\n+ mainnet-deb-package = runInLinuxImage\n+ ((buildDeb packageDesc-mainnet).packageDeb // { diskImage = ubuntuImage; });\n+ babylonnet-rpm-package = runInLinuxImage\n+ ((buildRpm packageDesc-babylonnet).packageRpm // {\n+ diskImage = fedoraImage;\n+ });\n+\n+ babylonnet-deb-package = runInLinuxImage\n+ ((buildDeb packageDesc-babylonnet).packageDeb // {\n+ diskImage = ubuntuImage;\n+ });\n+\n+ tezos-client-mainnet = stdenv.mkDerivation rec {\n+ name = \"tezos-client-mainnet-${mainnet.rev}\";\n+ phases = \"copyPhase\";\n+ copyPhase = ''\n+ mkdir -p $out\n+ cp ${binary-mainnet} $out/${name}\n+ '';\n+ };\n+ tezos-client-babylonnet = stdenv.mkDerivation rec {\n+ name = \"tezos-client-babylonnet-${babylonnet.rev}\";\n+ phases = \"copyPhase\";\n+ copyPhase = ''\n+ mkdir -p $out\n+ cp ${binary-babylonnet} $out/${name}\n+ '';\n+ };\n+\n+in rec {\n+ inherit tezos-client-mainnet tezos-client-babylonnet mainnet-deb-package\n+ mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n{ pkgs ? import <nixpkgs> { } }:\n+branchInfo:\n+\nlet\noca = pkgs.ocaml-ng.ocamlPackages_4_07.overrideScope' (self: super: {\nbigstring = self.callPackage\n@@ -240,17 +242,11 @@ let\nminimumOCamlVersion = \"4.07\";\n- #src = ./.;\n- #patches = [ ./fix.patch ]; # babylonnet\n- patches = [ ./fix-mainnet.patch ];\n+ patches = [ branchInfo.patchFile ];\nsrc = fetchgit {\nurl = \"https://gitlab.com/tezos/tezos.git/\";\n- # babylonnet:\n- #rev = \"b8731913f21091e14dea9c2b6657e768c1342650\";\n- #sha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\n- # mainnet:\n- rev = \"94f779a7517f04d1786d710b0b8deea7a9c1f762\";\n- sha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\n+ rev = branchInfo.rev;\n+ sha256 = branchInfo.sha256;\n};\npreInstall = ''\ncp src/*/*.install .\n"
},
{
"change_type": "RENAME",
"old_path": "nix/fix.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "packageDeb.nix",
"new_path": "packageDeb.nix",
"diff": "@@ -6,17 +6,17 @@ pkgDesc:\nlet\nproject = pkgDesc.project;\n- majorVersion = pkgDesc.majorVersion;\n- minorVersion = pkgDesc.minorVersion;\n- pkgRevision = pkgDesc.packageRevision;\n+ version = pkgDesc.version;\n+ revision = pkgDesc.gitRevision;\n+ pkgArch = pkgDesc.arch;\nbin = pkgDesc.bin;\n- pkgName = \"${project}_${majorVersion}.${minorVersion}-${pkgRevision}\";\n+ pkgName = \"${project}_0ubuntu${version}-${revision}_${pkgArch}\";\nwriteControlFile = writeTextFile {\nname = \"control\";\ntext = ''\nPackage: ${project}\n- Version: ${majorVersion}.${minorVersion}-${pkgRevision}\n+ Version: ${version}-${revision}\nPriority: optional\nArchitecture: ${pkgDesc.arch}\nDepends: ${pkgDesc.dependencies}\n@@ -42,7 +42,7 @@ in rec {\ncp ${writeControlFile} ${pkgName}/DEBIAN/control\ndpkg-deb --build ${pkgName}\n- mv ${pkgName}.deb $out\n+ cp ${pkgName}.deb $out\n'';\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "packageRpm.nix",
"new_path": "packageRpm.nix",
"diff": "@@ -6,35 +6,35 @@ pkgDesc:\nlet\nproject = pkgDesc.project;\n- majorVersion = pkgDesc.majorVersion;\n- minorVersion = pkgDesc.minorVersion;\n- pkgRevision = pkgDesc.packageRevision;\n+ version = pkgDesc.version;\n+ revision = pkgDesc.gitRevision;\narch = pkgDesc.arch;\nbin = pkgDesc.bin;\n- pkgName = \"${project}-${majorVersion}.${minorVersion}-${pkgRevision}.${arch}\";\n+ pkgName = \"${project}-${version}-${revision}.${arch}\";\nlicenseFile = pkgDesc.licenseFile;\nwriteSpecFile = writeTextFile {\nname = \"${project}.spec\";\ntext = ''\nName: ${project}\n- Release: ${pkgRevision}\n+ Version: ${version}\n+ Release: ${revision}\nSummary: ${pkgDesc.description}\nLicense: ${pkgDesc.license}\n- Version: ${majorVersion}.${minorVersion}\n%description\n${pkgDesc.description}\n+ Maintainer: ${pkgDesc.maintainer}\n%files\n/usr/local/bin/${project}\n- %doc %name-%version/LICENSE\n+ %doc %name/LICENSE\n'';\n};\nin rec {\npackageRpm =\n- stdenv.mkDerivation {\n+ stdenv.mkDerivation rec {\nname = \"${pkgName}.rpm\";\nphases = \"packagePhase\";\n@@ -45,8 +45,8 @@ in rec {\ncd rpmbuild\nmkdir SPECS\ncp ${writeSpecFile} SPECS/${project}.spec\n- mkdir -p BUILD/${project}-${majorVersion}.${minorVersion}\n- cp ${licenseFile} BUILD/${project}-${majorVersion}.${minorVersion}/LICENSE\n+ mkdir -p BUILD/${project}\n+ cp ${licenseFile} BUILD/${project}/LICENSE\nmkdir -p BUILDROOT/${pkgName}/usr/local/bin\ncp ${bin} BUILDROOT/${pkgName}/usr/local/bin/${project}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#4] Update package and binary names
Problem:
1) There is no actual versioning for tezos-client
2) We want to have binaries and packages for both mainnet and babylonnet
Solution:
1) Use timestamp in ISO 8601 and short git hash as a version
2) Produce required files in CI as well
|
603,652
|
15.11.2019 13:21:30
| -10,800
|
c2401cdb3aa1ac822e5737de1107728ef261e71a
|
Update README
Problem: `default.nix` has changed, also PPA will be updated.
Solution: Update instructions in README.md.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -15,11 +15,36 @@ using `babylonnet.sh` or `mainnet.sh` scripts.\n## Build Instructions\n-Run `nix-build -A tezos-client-static -o tezos-static`\n-to build staticically linked `tezos-client` executable.\n+### Statically built binary\n-Run `nix-build -A tezos-client-{rpm, deb}-package -o tezos-client-package` in order\n-to build native `.rpm` or `.deb` package for Red Hat and Debian-based distros.\n+Run one of the following commands:\n+```\n+nix-build -A tezos-client-mainnet -o tezos-client\n+nix-build -A tezos-client-babylonnet -o tezos-client\n+```\n+To build `mainnet` or `babylonnet` versions of `tezos-client` executable\n+\n+### Ubuntu `.deb` package\n+\n+Run one of the following commands:\n+```\n+nix-build -A mainnet-deb-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n+nix-build -A babylonnet-deb-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n+```\n+\n+To build `.deb` package with `mainnet` or `babylonnet` `tezos-client` executable. Once you install\n+such package the command `tezos-client-mainnet` or `tezos-client-babylonnet` will be available.\n+\n+### Fedora `.rpm` package\n+\n+Run one of the following commands:\n+```\n+nix-build -A mainnet-rpm-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n+nix-build -A babylonnet-rpm-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n+```\n+\n+To build `.rpm` package with `mainnet` or `babylonnet` `tezos-client` executable. Once you install\n+such package the command `tezos-client-mainnet` or `tezos-client-babylonnet` will be available.\n## Obtain binary or packages from CI\n@@ -29,9 +54,9 @@ click on `build and package` stage, choose `Artifacts` section and download file\n## Ubuntu (Debian based distros) usage\n-### Install downloaded `.deb` package\n+### Install `.deb` package\n-Download `.deb` file from the CI and double-click on it or run:\n+Build or download `.deb` file from the CI and double-click on it or run:\n```\nsudo apt install <path to deb file>\n```\n@@ -42,19 +67,20 @@ Also if you are using Ubuntu you can use PPA in order to install `tezos-client`.\nIn order to do that run the following commands:\n```\nsudo add-apt-repository ppa:serokell/tezos && sudo apt-get update\n-sudo apt-get install tezos-client\n+sudo apt-get install tezos-client-mainnet\n+sudo apt-get install tezos-client-babylonnet\n```\n## Fedora (Red Hat) usage\n-Download `.rpm` file from the CI and double-click on it or run:\n+Build or download `.rpm` file from the CI and double-click on it or run:\n```\nsudo yum localinstall <path to the rpm file>\n```\n## Other Linux distros usage\n-Download statically built `tezos-client` binary from the CI.\n+Download or build static `tezos-client` binary from the CI.\nMake it executable:\n```\nchmod +x tezos-client\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#4] Update README
Problem: `default.nix` has changed, also PPA will be updated.
Solution: Update instructions in README.md.
|
603,652
|
25.11.2019 19:04:48
| -10,800
|
476273d550b63e184b8771eb447bd0281a7ae39c
|
Add Makefile
Add Makefile so that it is possible to do e.g. `make rpm` instead of
`nix-build -A mainnet-rpm-package -o tezos-client-package --arg
timestamp $(date +"%Y%m%d%H%M")`
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Makefile",
"diff": "+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+ts := $(shell date +\"%Y%m%d%H%M\")\n+\n+binary:\n+ nix-build -A tezos-client-babylonnet -o tezos-client\n+ cp tezos-client/tezos-client-babylonnet-* tezos-client-babylonnet\n+ rm tezos-client\n+\n+binary-mainnet:\n+ nix-build -A tezos-client-mainnet -o tezos-client\n+ cp tezos-client/tezos-client-mainnet-* ./tezos-client-mainnet\n+ rm tezos-client\n+\n+rpm:\n+ nix-build -A babylonnet-rpm-package -o tezos-client-package --arg timestamp $(ts)\n+ cp -a tezos-client-package/*.rpm .\n+ rm tezos-client-package\n+\n+rpm-mainnet:\n+ nix-build -A mainnet-rpm-package -o tezos-client-package --arg timestamp $(ts)\n+ cp -a tezos-client-package/*.rpm .\n+ rm tezos-client-package\n+\n+deb:\n+ nix-build -A babylonnet-deb-package -o tezos-client-package --arg timestamp $(ts)\n+ cp -a tezos-client-package/*.deb .\n+ rm tezos-client-package\n+\n+deb-mainnet:\n+ nix-build -A mainnet-deb-package -o tezos-client-package --arg timestamp $(ts)\n+ cp -a tezos-client-package/*.deb .\n+ rm tezos-client-package\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -22,6 +22,13 @@ Run one of the following commands:\nnix-build -A tezos-client-mainnet -o tezos-client\nnix-build -A tezos-client-babylonnet -o tezos-client\n```\n+\n+Or use Makefile:\n+```bash\n+make binary #build tezos-client-babylonnet\n+make binary-mainnet #build tezos-client-mainnet\n+```\n+\nTo build `mainnet` or `babylonnet` versions of `tezos-client` executable\n### Ubuntu `.deb` package\n@@ -32,6 +39,12 @@ nix-build -A mainnet-deb-package -o tezos-client-package --arg timestamp $(date\nnix-build -A babylonnet-deb-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n```\n+Or use Makefile:\n+```bash\n+make deb #build deb package with tezos-client-babylonnet\n+make deb-mainnet #build deb package with tezos-client-mainnet\n+```\n+\nTo build `.deb` package with `mainnet` or `babylonnet` `tezos-client` executable. Once you install\nsuch package the command `tezos-client-mainnet` or `tezos-client-babylonnet` will be available.\n@@ -43,6 +56,12 @@ nix-build -A mainnet-rpm-package -o tezos-client-package --arg timestamp $(date\nnix-build -A babylonnet-rpm-package -o tezos-client-package --arg timestamp $(date +\"%Y%m%d%H%M\")\n```\n+Or use Makefile:\n+```bash\n+make rpm #build rpm package with tezos-client-babylonnet\n+make rpm-mainnet #build rpm package with tezos-client-mainnet\n+```\n+\nTo build `.rpm` package with `mainnet` or `babylonnet` `tezos-client` executable. Once you install\nsuch package the command `tezos-client-mainnet` or `tezos-client-babylonnet` will be available.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#4] Add Makefile
Add Makefile so that it is possible to do e.g. `make rpm` instead of
`nix-build -A mainnet-rpm-package -o tezos-client-package --arg
timestamp $(date +"%Y%m%d%H%M")`
|
603,652
|
10.12.2019 16:06:55
| -10,800
|
0b7d07cfebe68f013d0bc6566e327bf6aea434c5
|
Rename repo
Problem: We are going to package other tezos-related binaries as well,
thus `tezos-client-packaging` is not the best name for repo.
Solution: Rename it once again, now to `tezos-packaging`
|
[
{
"change_type": "MODIFY",
"old_path": ".github/CONTRIBUTING.md",
"new_path": ".github/CONTRIBUTING.md",
"diff": "## Reporting Issues\n-Please [open an issue](https://github.com/serokell/tezos-client/issues/new/choose)\n+Please [open an issue](https://github.com/serokell/tezos-packaging/issues/new/choose)\nif you find a bug or have a feature request.\nBefore submitting a bug report or feature request, check to make sure it hasn't already been submitted\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "- SPDX-License-Identifier: MPL-2.0\n-->\n-# `tezos-client`\n+# Tezos packaging\n-[](https://buildkite.com/serokell/tezos-client)\n+[](https://buildkite.com/serokell/tezos-packaging?branch=master)\n+\n+This repo provides various form of distribution for tezos-related executables\n+(unfortunately, only `tezos-client` for now, see [this issue](https://github.com/serokell/tezos-packaging/issues/14)).\n`tezos-client` is CLI tool used for interaction with Tezos blockchain.\nThis repo contains nix expression for building staticically linked\n@@ -68,7 +71,7 @@ such package the command `tezos-client-mainnet` or `tezos-client-babylonnet` wil\n## Obtain binary or packages from CI\nIf you don't want to build these files from scratch, you can download artifacts\n-produced by the CI. Go to the [latest master build](https://buildkite.com/serokell/tezos-client-packaging/builds/latest?branch=master),\n+produced by the CI. Go to the [latest master build](https://buildkite.com/serokell/tezos-packaging/builds/latest?branch=master),\nclick on `build and package` stage, choose `Artifacts` section and download files by clcking on the filenames.\n## Ubuntu (Debian based distros) usage\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Rename repo
Problem: We are going to package other tezos-related binaries as well,
thus `tezos-client-packaging` is not the best name for repo.
Solution: Rename it once again, now to `tezos-packaging`
|
603,652
|
03.12.2019 16:29:51
| -10,800
|
5da6bdfd1198b9623a16020829b06d6babd91957
|
Do not use VM during packaging
Problem: Currently we run linux VM in order to generate .deb or .rpm
package. However, this is slow and consumes a lot of resoures.
Solution: Run `dpkg-deb` and `rpm-build` directly in nix.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -39,32 +39,18 @@ let\ngitRevision = babylonnet.rev;\n};\n- buildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile; };\n+ buildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile dpkg; };\nbuildRpm = packageDesc:\n- import ./packageRpm.nix { inherit stdenv writeTextFile; }\n+ import ./packageRpm.nix { inherit stdenv writeTextFile rpm buildFHSUserEnv; }\n(packageDesc // { arch = \"x86_64\"; });\n- inherit (vmTools)\n- makeImageFromDebDist makeImageFromRPMDist debDistros rpmDistros\n- runInLinuxImage;\n- ubuntuImage = makeImageFromDebDist debDistros.ubuntu1804x86_64;\n- fedoraImage = makeImageFromRPMDist rpmDistros.fedora27x86_64;\n+ mainnet-rpm-package = buildRpm packageDesc-mainnet;\n- mainnet-rpm-package = runInLinuxImage\n- ((buildRpm packageDesc-mainnet).packageRpm // { diskImage = fedoraImage; });\n+ mainnet-deb-package = buildDeb packageDesc-mainnet;\n- mainnet-deb-package = runInLinuxImage\n- ((buildDeb packageDesc-mainnet).packageDeb // { diskImage = ubuntuImage; });\n+ babylonnet-rpm-package = buildRpm packageDesc-babylonnet;\n- babylonnet-rpm-package = runInLinuxImage\n- ((buildRpm packageDesc-babylonnet).packageRpm // {\n- diskImage = fedoraImage;\n- });\n-\n- babylonnet-deb-package = runInLinuxImage\n- ((buildDeb packageDesc-babylonnet).packageDeb // {\n- diskImage = ubuntuImage;\n- });\n+ babylonnet-deb-package = buildDeb packageDesc-babylonnet;\ntezos-client-mainnet = stdenv.mkDerivation rec {\nname = \"tezos-client-mainnet-${mainnet.rev}\";\n"
},
{
"change_type": "MODIFY",
"old_path": "packageDeb.nix",
"new_path": "packageDeb.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ stdenv, writeTextFile }:\n+{ stdenv, writeTextFile, dpkg }:\npkgDesc:\nlet\n@@ -26,11 +26,11 @@ let\n'';\n};\n-in rec {\n- packageDeb =\n- stdenv.mkDerivation {\n+in stdenv.mkDerivation rec {\nname = \"${pkgName}.deb\";\n+ nativeBuildInputs = [ dpkg ];\n+\nphases = \"packagePhase\";\npackagePhase = ''\n@@ -42,7 +42,7 @@ in rec {\ncp ${writeControlFile} ${pkgName}/DEBIAN/control\ndpkg-deb --build ${pkgName}\n- cp ${pkgName}.deb $out\n+ mkdir -p $out\n+ cp ${name} $out/\n'';\n- };\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "packageRpm.nix",
"new_path": "packageRpm.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ stdenv, writeTextFile }:\n+{ stdenv, writeTextFile, rpm, buildFHSUserEnv }:\npkgDesc:\nlet\n@@ -28,17 +28,20 @@ let\n%files\n/usr/local/bin/${project}\n- %doc %name/LICENSE\n'';\n};\n-in rec {\n- packageRpm =\n- stdenv.mkDerivation rec {\n- name = \"${pkgName}.rpm\";\n+ rpmbuild-env = buildFHSUserEnv {\n+ name = \"rpmbuild-env\";\n+ multiPkgs = pkgs: [ rpm ];\n+ runScript = \"rpmbuild\";\n+ };\n- phases = \"packagePhase\";\n+in stdenv.mkDerivation rec {\n+ name = \"${pkgName}\";\n+ phases = \"packagePhase\";\n+ buildInputs = [ rpmbuild-env ];\npackagePhase = ''\nHOME=$PWD\nmkdir rpmbuild\n@@ -51,9 +54,9 @@ in rec {\nmkdir -p BUILDROOT/${pkgName}/usr/local/bin\ncp ${bin} BUILDROOT/${pkgName}/usr/local/bin/${project}\n- rpmbuild -bb SPECS/${project}.spec\n- cp RPMS/${arch}/${pkgName}.rpm $out\n+ rpmbuild-env -bb SPECS/${project}.spec --dbpath $HOME\n+ mkdir -p $out\n+ cp RPMS/*/*.rpm $out/\n'';\n- };\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#10] Do not use VM during packaging
Problem: Currently we run linux VM in order to generate .deb or .rpm
package. However, this is slow and consumes a lot of resoures.
Solution: Run `dpkg-deb` and `rpm-build` directly in nix.
|
603,652
|
22.11.2019 11:49:58
| -10,800
|
af942bf369ed5428f6d09a56d6403360edc07102
|
Add `.src.rpm` generating
Problem: We want to upload our rpm package to copr, we need `.src.rpm`
package for this.
Solution: Generate it along with `.rpm` package.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -31,17 +31,19 @@ let\nlicenseFile = \"${root}/LICENSES/MPL-2.0.txt\";\ndescription = \"CLI client for interacting with tezos blockchain\";\ngitRevision = mainnet.rev;\n+ branchName = \"mainnet\";\n};\npackageDesc-babylonnet = packageDesc-mainnet // {\nproject = \"tezos-client-babylonnet\";\nbin = binary-babylonnet;\ngitRevision = babylonnet.rev;\n+ branchName = \"babylonnet\";\n};\nbuildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile dpkg; };\nbuildRpm = packageDesc:\n- import ./packageRpm.nix { inherit stdenv writeTextFile rpm buildFHSUserEnv; }\n+ import ./packageRpm.nix { inherit stdenv writeTextFile gnutar rpm buildFHSUserEnv; }\n(packageDesc // { arch = \"x86_64\"; });\nmainnet-rpm-package = buildRpm packageDesc-mainnet;\n"
},
{
"change_type": "MODIFY",
"old_path": "packageRpm.nix",
"new_path": "packageRpm.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ stdenv, writeTextFile, rpm, buildFHSUserEnv }:\n+{ stdenv, writeTextFile, gnutar, rpm, buildFHSUserEnv }:\npkgDesc:\nlet\n@@ -13,49 +13,74 @@ let\npkgName = \"${project}-${version}-${revision}.${arch}\";\nlicenseFile = pkgDesc.licenseFile;\n+ rpmbuild-env = buildFHSUserEnv {\n+ name = \"rpmbuild-env\";\n+ multiPkgs = pkgs: [ rpm ];\n+ runScript = \"rpmbuild\";\n+ };\n+\nwriteSpecFile = writeTextFile {\nname = \"${project}.spec\";\ntext = ''\n+ %define debug_package %{nil}\n+ %define _unpackaged_files_terminate_build 0\nName: ${project}\nVersion: ${version}\nRelease: ${revision}\nSummary: ${pkgDesc.description}\nLicense: ${pkgDesc.license}\n-\n+ BuildArch: ${arch}\n+ Source0: ${project}-${version}.tar.gz\n+ Source1: https://gitlab.com/tezos/tezos/tree/${pkgDesc.branchName}/\n%description\n${pkgDesc.description}\nMaintainer: ${pkgDesc.maintainer}\n-\n+ %prep\n+ %setup -q\n+ %build\n+ %install\n+ mkdir -p %{buildroot}/%{_bindir}\n+ install -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}\n%files\n- /usr/local/bin/${project}\n+ %license LICENSE\n+ %{_bindir}/%{name}\n'';\n};\n- rpmbuild-env = buildFHSUserEnv {\n- name = \"rpmbuild-env\";\n- multiPkgs = pkgs: [ rpm ];\n- runScript = \"rpmbuild\";\n+ sourceArchive = stdenv.mkDerivation rec {\n+ name = \"${project}-${version}.tar.gz\";\n+\n+ phases = \"archivePhase\";\n+\n+ archivePhase = ''\n+ mkdir ${project}-${version}\n+ cp ${licenseFile} ${project}-${version}/LICENSE\n+ cp ${bin} ${project}-${version}/${project}\n+ tar -cvzf ${name} ${project}-${version}\n+ cp ${name} $out\n+ '';\n};\nin stdenv.mkDerivation rec {\n- name = \"${pkgName}\";\n+ name = \"${pkgName}.rpm\";\nphases = \"packagePhase\";\n+\nbuildInputs = [ rpmbuild-env ];\n+\npackagePhase = ''\nHOME=$PWD\nmkdir rpmbuild\ncd rpmbuild\nmkdir SPECS\n+ mkdir SOURCES\ncp ${writeSpecFile} SPECS/${project}.spec\n+ cp ${sourceArchive} SOURCES/${sourceArchive.name}\nmkdir -p BUILD/${project}\ncp ${licenseFile} BUILD/${project}/LICENSE\n-\n- mkdir -p BUILDROOT/${pkgName}/usr/local/bin\n- cp ${bin} BUILDROOT/${pkgName}/usr/local/bin/${project}\n-\n- rpmbuild-env -bb SPECS/${project}.spec --dbpath $HOME\n+ rpmbuild-env -ba SPECS/${project}.spec --define '_bindir /usr/bin' --define '_datadir /usr/share'\nmkdir -p $out\n+ cp SRPMS/*.src.rpm $out/\ncp RPMS/*/*.rpm $out/\n'';\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#12] Add `.src.rpm` generating
Problem: We want to upload our rpm package to copr, we need `.src.rpm`
package for this.
Solution: Generate it along with `.rpm` package.
|
603,652
|
04.12.2019 17:37:30
| -10,800
|
489471f6f27abcb980313d64cdbd470b419b7dd9
|
Mention Copr in README
Problem: Now it is possible to install tezos-client on fedora using yum
and our copr repo.
Solution: Mention this in README.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -95,14 +95,32 @@ sudo apt-get install tezos-client-babylonnet\n## Fedora (Red Hat) usage\n+\n+### Install `.rpm` package\n+\nBuild or download `.rpm` file from the CI and double-click on it or run:\n```\nsudo yum localinstall <path to the rpm file>\n```\n+### Use copr package with `tezos-client`\n+\n+Also if you are using Fedora you can use Copr in order to install `tezos-client`.\n+In order to do that run the following commands:\n+```\n+# use dnf\n+sudo dnf copr enable @Serokell/Tezos\n+sudo dnf install tezos-client-mainnet\n+sudo dnf install tezos-client-babylonnet\n+\n+# or use yum\n+sudo yum copr enable @Serokell/Tezos\n+sudo yum install tezos-client-mainnet\n+sudo yum install tezos-client-babylonnet\n+```\n## Other Linux distros usage\n-Download or build static `tezos-client` binary from the CI.\n+Build static `tezos-client` binary or download it from the CI.\nMake it executable:\n```\nchmod +x tezos-client\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#12] Mention Copr in README
Problem: Now it is possible to install tezos-client on fedora using yum
and our copr repo.
Solution: Mention this in README.
|
603,652
|
09.12.2019 12:23:08
| -10,800
|
ddfd10d5cfe73516cd07b323022fa7556fa02ccb
|
Pin crossref-verifier revision
Problem: crossref-verifier `master` branch changes over time. We don't
want CI to fail because of these changes.
Solution: Use a specific revision (the latest one).
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -11,7 +11,7 @@ steps:\nlabel: reuse lint\n- command: .buildkite/check-trailing-whitespace.sh\nlabel: check trailing whitespace\n- - command: \"nix run -f https://github.com/serokell/crossref-verifier/archive/master.tar.gz -c crossref-verify\"\n+ - command: \"nix run -f https://github.com/serokell/crossref-verifier/archive/68a1f9d25b6e7835fea8299b18a3e6c61dbb2a5c.tar.gz -c crossref-verify\"\nlabel: crossref-verify\nsoft_fail: true\n- commands:\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Pin crossref-verifier revision
Problem: crossref-verifier `master` branch changes over time. We don't
want CI to fail because of these changes.
Solution: Use a specific revision (the latest one).
|
603,652
|
20.12.2019 17:58:32
| -10,800
|
64850e86769c09543b1cc986a9deb9dccad3c2bd
|
Update license in packages
Problem: All packages have MPL-2.0 license, however it is a bit
incorrect.
Solution: Use license from tezos repo instead.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -25,10 +25,10 @@ let\nversion = toString timestamp;\nbin = binary-mainnet;\narch = \"amd64\";\n- license = \"MPL-2.0\";\n+ license = \"MIT\";\ndependencies = \"\";\nmaintainer = \"Serokell https://serokell.io\";\n- licenseFile = \"${root}/LICENSES/MPL-2.0.txt\";\n+ licenseFile = \"${tezos-client-static-mainnet}/LICENSE\";\ndescription = \"CLI client for interacting with tezos blockchain\";\ngitRevision = mainnet.rev;\nbranchName = \"mainnet\";\n@@ -38,6 +38,7 @@ let\nproject = \"tezos-client-babylonnet\";\nbin = binary-babylonnet;\ngitRevision = babylonnet.rev;\n+ licenseFile = \"${tezos-client-static-babylonnet}/LICENSE\";\nbranchName = \"babylonnet\";\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -286,6 +286,8 @@ let\nmkdir -p $out/bin\ncp _build/default/src/bin_client/main_client.exe $out/bin/tezos-client\ncp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-admin\n+ # Reuse license from tezos repo in packaging\n+ cp LICENSE $out/LICENSE\n'';\n}) { };\n});\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#16] Update license in packages
Problem: All packages have MPL-2.0 license, however it is a bit
incorrect.
Solution: Use license from tezos repo instead.
|
603,652
|
10.01.2020 15:16:55
| -10,800
|
fb1c97020adda33004e516b27f222223fbc296d7
|
Compress binaries with upx
Motivation: Produced static binaries appear to be well amenable to
packing with upx tool. So we compress them to reduce size of the
resulted binaries and packages.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -235,7 +235,7 @@ let\n, js_of_ocaml, cmdliner, easy-format, ocp-ocamlres, tls, lwt4, lwt_log\n, mtime, ocplib-endian, ptime, re, rresult, stdio, uri, uutf, zarith\n, libusb1, hidapi, gmp, irmin, alcotest, dum, genspio, pprint, ocamlgraph\n- , findlib, digestif }:\n+ , findlib, digestif, upx }:\nbuildDunePackage rec {\npname = \"tezos\";\nversion = \"0.0.1\";\n@@ -279,7 +279,7 @@ let\nocamlgraph\nfindlib\ngenspio\n- ] ++ [ libusb1 libusb1.out (gmp.override { withStatic = true; }) ];\n+ ] ++ [ libusb1 libusb1.out (gmp.override { withStatic = true; }) upx ];\ndoCheck = false;\nbuildPhase = \"dune build src/bin_client/tezos-client.install\";\ninstallPhase = ''\n@@ -288,6 +288,8 @@ let\ncp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-admin\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n+ # Compress binaries with upx\n+ upx $out/bin/*\n'';\n}) { };\n});\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#23] Compress binaries with upx
Motivation: Produced static binaries appear to be well amenable to
packing with upx tool. So we compress them to reduce size of the
resulted binaries and packages.
|
603,652
|
09.01.2020 15:50:07
| -10,800
|
97dcafff52eb0fa123c87e2de904fa2def056cde
|
Add autorelease script
Problem: We want easier and more convenient way to get static binaries
(also packages, but this is secondarily).
Solution: Add autorelease script that produces github prerelease with
all closures (binaries and packages).
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -29,3 +29,9 @@ steps:\n- ./mainnet-deb-package/*\n- ./babylonnet-rpm-package/*\n- ./babylonnet-deb-package/*\n+ branches: !master\n+ - commands:\n+ - GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n+ label: create auto pre-release\n+ # TODO: uncomment me before merging\n+ # branches: master\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -20,7 +20,10 @@ let\ntezos-client-static-babylonnet = import ./nix/static.nix babylonnet;\nbinary-mainnet = \"${tezos-client-static-mainnet}/bin/tezos-client\";\nbinary-babylonnet = \"${tezos-client-static-babylonnet}/bin/tezos-client\";\n+ # Hopefully, there is always will be single LICENSE for all binaries and branches\n+ licenseFile = \"${tezos-client-static-mainnet}/LICENSE\";\npackageDesc-mainnet = {\n+ inherit licenseFile;\nproject = \"tezos-client-mainnet\";\nversion = toString timestamp;\nbin = binary-mainnet;\n@@ -28,7 +31,6 @@ let\nlicense = \"MIT\";\ndependencies = \"\";\nmaintainer = \"Serokell https://serokell.io\";\n- licenseFile = \"${tezos-client-static-mainnet}/LICENSE\";\ndescription = \"CLI client for interacting with tezos blockchain\";\ngitRevision = mainnet.rev;\nbranchName = \"mainnet\";\n@@ -38,7 +40,6 @@ let\nproject = \"tezos-client-babylonnet\";\nbin = binary-babylonnet;\ngitRevision = babylonnet.rev;\n- licenseFile = \"${tezos-client-static-babylonnet}/LICENSE\";\nbranchName = \"babylonnet\";\n};\n@@ -71,8 +72,16 @@ let\ncp ${binary-babylonnet} $out/${name}\n'';\n};\n+ tezos-license = stdenv.mkDerivation rec {\n+ name = \"LICENSE\";\n+ phases = \"copyPhase\";\n+ copyPhase = ''\n+ mkdir -p $out\n+ cp ${licenseFile} $out/${name}\n+ '';\n+ };\nin rec {\ninherit tezos-client-mainnet tezos-client-babylonnet mainnet-deb-package\n- mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package;\n+ mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package tezos-license;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "release.nix",
"diff": "+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\" }:\n+let closures = builtins.attrValues (import ./. { inherit pkgs timestamp; });\n+in pkgs.runCommandNoCC \"release\" { inherit closures; } ''\n+ mkdir -p $out\n+ for closure in $closures; do\n+ cp $closure/* $out/\n+ done\n+''\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/autorelease.sh",
"diff": "+#!/usr/bin/env nix-shell\n+#!nix-shell -p gitAndTools.hub git -i bash\n+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# Project name, inferred from repository name\n+project=$(basename $(pwd))\n+\n+# The directory in which artifacts will be created\n+TEMPDIR=`mktemp -d`\n+\n+# Build release.nix\n+nix-build release.nix -o $TEMPDIR/$project --arg timestamp $(date +\\\"%Y%m%d%H%M\\\")\n+\n+# Delete release\n+hub release delete auto-release\n+\n+# Update the tag\n+git fetch # So that the script can be run from an arbitrary checkout\n+git tag -f auto-release\n+git push --force --tags\n+\n+# Combine all assets\n+assets=\"\"\n+for file in $TEMPDIR/$project/*; do\n+ assets+=\"-a $file \"\n+done\n+\n+# Create release\n+hub release create $assets -m \"Automatic build on $(date -I)\" --prerelease auto-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#11] Add autorelease script
Problem: We want easier and more convenient way to get static binaries
(also packages, but this is secondarily).
Solution: Add autorelease script that produces github prerelease with
all closures (binaries and packages).
|
603,652
|
09.01.2020 17:20:48
| -10,800
|
3d0683f310d13b14269c6a80489f9d35a990ca2e
|
Update README
Motivation: Now we have more convenient way to obtain binaries or
packages using github releases (instead of going to buildkite
artifacts), so we will use it as a preferable way to get these artifacts.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -68,11 +68,11 @@ make rpm-mainnet #build rpm package with tezos-client-mainnet\nTo build `.rpm` package with `mainnet` or `babylonnet` `tezos-client` executable. Once you install\nsuch package the command `tezos-client-mainnet` or `tezos-client-babylonnet` will be available.\n-## Obtain binary or packages from CI\n+## Obtain binary or packages from github release\n-If you don't want to build these files from scratch, you can download artifacts\n-produced by the CI. Go to the [latest master build](https://buildkite.com/serokell/tezos-packaging/builds/latest?branch=master),\n-click on `build and package` stage, choose `Artifacts` section and download files by clcking on the filenames.\n+If you don't want to build these files from scratch, you can download assets from github release.\n+Go to the [latest release](https://github.com/serokell/tezos-packaging/releases/latest)\n+and download desired assets.\n## Ubuntu (Debian based distros) usage\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#11] Update README
Motivation: Now we have more convenient way to obtain binaries or
packages using github releases (instead of going to buildkite
artifacts), so we will use it as a preferable way to get these artifacts.
|
603,657
|
14.01.2020 15:30:26
| -3,600
|
70dca02118a20f09b9bb30e51683961ae40bb9ec
|
pipeline.yml: prepare for merge
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -33,5 +33,4 @@ steps:\n- commands:\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nlabel: create auto pre-release\n- # TODO: uncomment me before merging\n- # branches: master\n+ branches: master\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
pipeline.yml: prepare for merge
|
603,652
|
10.12.2019 13:10:47
| -10,800
|
82eb1a8a8400209a800f5073e8b947d1388c57f9
|
Build `tezos-node`
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -10,18 +10,19 @@ let\nrev = \"94f779a7\";\nsha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\npatchFile = ./nix/fix-mainnet.patch;\n+ protoName = \"proto_005_PsBabyM1\";\n};\nbabylonnet = {\nrev = \"b8731913\";\nsha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\npatchFile = ./nix/fix-babylonnet.patch;\n+ protoName = \"proto_005_PsBabyM1\";\n};\n- tezos-client-static-mainnet = import ./nix/static.nix mainnet;\n- tezos-client-static-babylonnet = import ./nix/static.nix babylonnet;\n- binary-mainnet = \"${tezos-client-static-mainnet}/bin/tezos-client\";\n- binary-babylonnet = \"${tezos-client-static-babylonnet}/bin/tezos-client\";\n- # Hopefully, there will always be a single LICENSE for all binaries and branches\n- licenseFile = \"${tezos-client-static-mainnet}/LICENSE\";\n+ static-nix = import ./nix/static.nix;\n+ tezos-static-mainnet = static-nix mainnet;\n+ tezos-static-babylonnet = static-nix babylonnet;\n+ binary-mainnet = \"${tezos-static-mainnet}/bin/tezos-client\";\n+ binary-babylonnet = \"${tezos-static-babylonnet}/bin/tezos-client\";\npackageDesc-mainnet = {\ninherit licenseFile;\nproject = \"tezos-client-mainnet\";\n@@ -82,6 +83,7 @@ let\n};\nin rec {\n- inherit tezos-client-mainnet tezos-client-babylonnet mainnet-deb-package\n- mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package tezos-license;\n+ inherit\n+ mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package tezos-license\n+ tezos-static-mainnet tezos-static-babylonnet;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -229,13 +229,56 @@ let\n};\npropagatedBuildInputs = [ fmt astring ];\n}) { };\n+ pprint = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, ocamlbuild }:\n+ buildDunePackage rec {\n+ pname = \"pprint\";\n+ version = \"20180528\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = fetchFromGitHub {\n+ owner = \"fpottier\";\n+ repo = \"${pname}\";\n+ rev = \"${version}\";\n+ sha256 = \"1jhmmd7ik1lx9y5niqv5rknhq02pkwmyxc5c0wndp5cyp8hsj0py\";\n+ };\n+ buildInputs = [ ocamlbuild ];\n+ buildPhase = \"\";\n+ installPhase = ''\n+ mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ make install\n+ '';\n+ doCheck = false;\n+ }) { };\n+ ocp-ocamlres = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, pprint, astring, base }:\n+ buildDunePackage rec {\n+ pname = \"ocp-ocamlres\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = fetchFromGitHub {\n+ owner = \"OCamlPro\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn\";\n+ };\n+ buildInputs = [ pprint astring base ];\n+ buildPhase = \"\";\n+ installPhase = ''\n+ mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ mkdir -p $out/lib/ocaml/4.07.1/bin\n+ make install\n+ '';\n+ doCheck = false;\n+ }) { };\ntezos = self.callPackage ({ stdenv, fetchgit, buildDunePackage, base\n, bigstring, cohttp-lwt, cohttp-lwt-unix, cstruct, ezjsonm, hex, ipaddr\n- , js_of_ocaml, cmdliner, easy-format, ocp-ocamlres, tls, lwt4, lwt_log\n+ , js_of_ocaml, cmdliner, easy-format, tls, lwt4, lwt_log\n, mtime, ocplib-endian, ptime, re, rresult, stdio, uri, uutf, zarith\n- , libusb1, hidapi, gmp, irmin, alcotest, dum, genspio, pprint, ocamlgraph\n- , findlib, digestif, upx }:\n+ , libusb1, hidapi, gmp, irmin, alcotest, dum, genspio, ocamlgraph, findlib\n+ , digestif, ocp-ocamlres, pprint, upx }:\nbuildDunePackage rec {\npname = \"tezos\";\nversion = \"0.0.1\";\n@@ -274,18 +317,33 @@ let\nstdio\nuri\nuutf\n- zarith # cmdliner easy-format js_of_ocaml ocp-ocamlres tls\n+ zarith\n+ cmdliner\n+ # easy-format js_of_ocaml ocp-ocamlres tls\n# alcotest dum pprint\n+ ocp-ocamlres\n+ pprint\nocamlgraph\nfindlib\ngenspio\n] ++ [ libusb1 libusb1.out (gmp.override { withStatic = true; }) upx ];\ndoCheck = false;\n- buildPhase = \"dune build src/bin_client/tezos-client.install\";\n+ buildPhase = ''\n+ # tezos-node build requires ocp-ocamlres binary in PATH\n+ PATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.07.1/bin\n+ dune build src/bin_client/tezos-client.install\n+ dune build src/bin_node/tezos-node.install\n+ # dune build src/${branchInfo.protoName}/bin_baker/tezos-baker.install\n+ '';\ninstallPhase = ''\nmkdir -p $out/bin\n+ # tezos-client and tezos-admin\ncp _build/default/src/bin_client/main_client.exe $out/bin/tezos-client\n- cp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-admin\n+ cp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-client-admin\n+ # tezos-node\n+ cp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n+ # tezos-baker\n+ # cp _build/default/src/${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe $out/bin/tezos-baker\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -17,3 +17,18 @@ index 6bee8e98..53006632 100644\n(install\n(section bin)\n+diff --git a/src/bin_node/dune b/src/bin_node/dune\n+index 54920a2..8bd54be 100644\n+--- a/src/bin_node/dune\n++++ b/src/bin_node/dune\n+@@ -28,7 +28,9 @@\n+ -open Tezos_validator\n+ -open Tezos_shell_context\n+ -open Tezos_protocol_updater\n+- -linkall)))\n++ -linkall\n++ -ccopt -static\n++ )))\n+\n+ (install\n+ (section bin)\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -13,6 +13,21 @@ index f42b53e6..7e47c074 100644\n+ -linkall\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (install\n+ (section bin)\n+diff --git a/src/bin_node/dune b/src/bin_node/dune\n+index 54920a2..8bd54be 100644\n+--- a/src/bin_node/dune\n++++ b/src/bin_node/dune\n+@@ -28,7 +28,9 @@\n+ -open Tezos_validator\n+ -open Tezos_shell_context\n+ -open Tezos_protocol_updater\n+- -linkall)))\n++ -linkall\n++ -ccopt -static\n+ )))\n(install\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-node`
|
603,652
|
10.12.2019 13:11:19
| -10,800
|
47ea2837c8459db77555d8eb419304ba9bfd9909
|
Build `tezos-baker`
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -6,17 +6,19 @@ with pkgs;\nlet\nroot = ./.;\n- mainnet = {\n+ mainnet = rec {\nrev = \"94f779a7\";\nsha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\npatchFile = ./nix/fix-mainnet.patch;\n- protoName = \"proto_005_PsBabyM1\";\n+ protoName = \"005_PsBabyM1\";\n+ binarySuffix = builtins.replaceStrings [\"_\"] [\"-\"] protoName;\n};\n- babylonnet = {\n+ babylonnet = rec {\nrev = \"b8731913\";\nsha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\npatchFile = ./nix/fix-babylonnet.patch;\n- protoName = \"proto_005_PsBabyM1\";\n+ protoName = \"005_PsBabyM1\";\n+ binarySuffix = builtins.replaceStrings [\"_\"] [\"-\"] protoName;\n};\nstatic-nix = import ./nix/static.nix;\ntezos-static-mainnet = static-nix mainnet;\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -333,7 +333,7 @@ let\nPATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.07.1/bin\ndune build src/bin_client/tezos-client.install\ndune build src/bin_node/tezos-node.install\n- # dune build src/${branchInfo.protoName}/bin_baker/tezos-baker.install\n+ dune build src/proto_${branchInfo.protoName}/bin_baker/tezos-baker-${branchInfo.binarySuffix}.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n@@ -343,7 +343,7 @@ let\n# tezos-node\ncp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n# tezos-baker\n- # cp _build/default/src/${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe $out/bin/tezos-baker\n+ cp _build/default/src/proto_${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe $out/bin/tezos-baker-${branchInfo.binarySuffix}\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -32,3 +32,19 @@ index 54920a2..8bd54be 100644\n(install\n(section bin)\n+diff --git a/src/proto_005_PsBabyM1/bin_baker/dune b/src/proto_005_PsBabyM1/bin_baker/dune\n+index 1414a08..12dba95 100644\n+--- a/src/proto_005_PsBabyM1/bin_baker/dune\n++++ b/src/proto_005_PsBabyM1/bin_baker/dune\n+@@ -10,7 +10,10 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -32,6 +32,22 @@ index 54920a2..8bd54be 100644\n(install\n(section bin)\n+diff --git a/src/proto_005_PsBabyM1/bin_baker/dune b/src/proto_005_PsBabyM1/bin_baker/dune\n+index 755e8d4..aeb8f2d 100644\n+--- a/src/proto_005_PsBabyM1/bin_baker/dune\n++++ b/src/proto_005_PsBabyM1/bin_baker/dune\n+@@ -9,7 +9,10 @@\n+ -open Tezos_client_005_PsBabyM1\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\ndiff --git a/src/lib_base/p2p_addr.ml b/src/lib_base/p2p_addr.ml\nindex d9139c4b..a3af815c 100644\n--- a/src/lib_base/p2p_addr.ml\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-baker`
|
603,652
|
10.12.2019 13:09:34
| -10,800
|
a1bb4b8bc004fd100b5af6fd01d0673fd4848cdf
|
Build `tezos-accuser`
|
[
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -334,6 +334,7 @@ let\ndune build src/bin_client/tezos-client.install\ndune build src/bin_node/tezos-node.install\ndune build src/proto_${branchInfo.protoName}/bin_baker/tezos-baker-${branchInfo.binarySuffix}.install\n+ dune build src/proto_${branchInfo.protoName}/bin_accuser/tezos-accuser-${branchInfo.binarySuffix}.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n@@ -344,6 +345,8 @@ let\ncp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n# tezos-baker\ncp _build/default/src/proto_${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe $out/bin/tezos-baker-${branchInfo.binarySuffix}\n+ # tezos-accuser\n+ cp _build/default/src/proto_${branchInfo.protoName}/bin_accuser/main_accuser_${branchInfo.protoName}.exe $out/bin/tezos-accuser-${branchInfo.binarySuffix}\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -48,3 +48,19 @@ index 1414a08..12dba95 100644\n(alias\n(name runtest_lint)\n+diff --git a/src/proto_005_PsBabyM1/bin_accuser/dune b/src/proto_005_PsBabyM1/bin_accuser/dune\n+index 2f2a6fd..fd9773b 100644\n+--- a/src/proto_005_PsBabyM1/bin_accuser/dune\n++++ b/src/proto_005_PsBabyM1/bin_accuser/dune\n+@@ -10,7 +10,10 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -44,6 +44,22 @@ index 755e8d4..aeb8f2d 100644\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_005_PsBabyM1/bin_accuser/dune b/src/proto_005_PsBabyM1/bin_accuser/dune\n+index 173ab99..eae42b2 100644\n+--- a/src/proto_005_PsBabyM1/bin_accuser/dune\n++++ b/src/proto_005_PsBabyM1/bin_accuser/dune\n+@@ -9,7 +9,10 @@\n+ -open Tezos_client_005_PsBabyM1\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n(alias\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-accuser`
|
603,652
|
10.12.2019 14:36:16
| -10,800
|
71a6fb2b837172a3ac297ca72d7674dcb00b4f3a
|
Build `tezos-endorser`
|
[
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -335,6 +335,7 @@ let\ndune build src/bin_node/tezos-node.install\ndune build src/proto_${branchInfo.protoName}/bin_baker/tezos-baker-${branchInfo.binarySuffix}.install\ndune build src/proto_${branchInfo.protoName}/bin_accuser/tezos-accuser-${branchInfo.binarySuffix}.install\n+ dune build src/proto_${branchInfo.protoName}/bin_endorser/tezos-endorser-${branchInfo.binarySuffix}.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n@@ -344,9 +345,14 @@ let\n# tezos-node\ncp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n# tezos-baker\n- cp _build/default/src/proto_${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe $out/bin/tezos-baker-${branchInfo.binarySuffix}\n+ cp _build/default/src/proto_${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe \\\n+ $out/bin/tezos-baker-${branchInfo.binarySuffix}\n# tezos-accuser\n- cp _build/default/src/proto_${branchInfo.protoName}/bin_accuser/main_accuser_${branchInfo.protoName}.exe $out/bin/tezos-accuser-${branchInfo.binarySuffix}\n+ cp _build/default/src/proto_${branchInfo.protoName}/bin_accuser/main_accuser_${branchInfo.protoName}.exe \\\n+ $out/bin/tezos-accuser-${branchInfo.binarySuffix}\n+ # tezos-endorser\n+ cp _build/default/src/proto_${branchInfo.protoName}/bin_endorser/main_endorser_${branchInfo.protoName}.exe \\\n+ $out/bin/tezos-endorser-${branchInfo.binarySuffix}\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -64,3 +64,20 @@ index 2f2a6fd..fd9773b 100644\n(alias\n(name runtest_lint)\n+diff --git a/src/proto_005_PsBabyM1/bin_endorser/dune b/src/proto_005_PsBabyM1/bin_endorser/dune\n+index d1b60c7..a738ef2 100644\n+--- a/src/proto_005_PsBabyM1/bin_endorser/dune\n++++ b/src/proto_005_PsBabyM1/bin_endorser/dune\n+@@ -10,7 +10,10 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n+ (name runtest_lint)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -60,6 +60,22 @@ index 173ab99..eae42b2 100644\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_005_PsBabyM1/bin_endorser/dune b/src/proto_005_PsBabyM1/bin_endorser/dune\n+index 9df7abf..e8402b8 100644\n+--- a/src/proto_005_PsBabyM1/bin_endorser/dune\n++++ b/src/proto_005_PsBabyM1/bin_endorser/dune\n+@@ -9,7 +9,10 @@\n+ -open Tezos_client_005_PsBabyM1\n+ -open Tezos_client_commands\n+ -open Tezos_baking_005_PsBabyM1_commands\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n(alias\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-endorser`
|
603,652
|
10.12.2019 15:05:36
| -10,800
|
39f9018f8888fb08ed910a8f50d316cb21e1129a
|
Build `tezos-signer`
|
[
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -336,6 +336,7 @@ let\ndune build src/proto_${branchInfo.protoName}/bin_baker/tezos-baker-${branchInfo.binarySuffix}.install\ndune build src/proto_${branchInfo.protoName}/bin_accuser/tezos-accuser-${branchInfo.binarySuffix}.install\ndune build src/proto_${branchInfo.protoName}/bin_endorser/tezos-endorser-${branchInfo.binarySuffix}.install\n+ dune build src/bin_signer/tezos-signer.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n@@ -353,6 +354,8 @@ let\n# tezos-endorser\ncp _build/default/src/proto_${branchInfo.protoName}/bin_endorser/main_endorser_${branchInfo.protoName}.exe \\\n$out/bin/tezos-endorser-${branchInfo.binarySuffix}\n+ # tezos-signer\n+ cp _build/default/src/bin_signer/main_signer.exe $out/bin/tezos-signer\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -80,4 +80,19 @@ index d1b60c7..a738ef2 100644\n(alias\n(name runtest_lint)\n+diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n+index e4c9a7c..2a5f941 100644\n+--- a/src/bin_signer/dune\n++++ b/src/bin_signer/dune\n+@@ -19,7 +19,10 @@\n+ -open Tezos_rpc_http_server\n+ -open Tezos_rpc_http_client_unix\n+ -open Tezos_stdlib_unix\n+- -open Tezos_stdlib)))\n++ -open Tezos_stdlib\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n(name runtest_lint)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -76,6 +76,22 @@ index 9df7abf..e8402b8 100644\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n++ )))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n+index c06413b..a81e206 100644\n+--- a/src/bin_signer/dune\n++++ b/src/bin_signer/dune\n+@@ -18,7 +18,10 @@\n+ -open Tezos_rpc_http\n+ -open Tezos_rpc_http_server\n+ -open Tezos_rpc_http_client_unix\n+- -open Tezos_stdlib_unix)))\n++ -open Tezos_stdlib_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n(alias\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-signer`
|
603,652
|
10.12.2019 15:23:48
| -10,800
|
e2ef2c1f59fd45633975cce86b23091585b3cbf2
|
Build `tezos-protocol-compiler`
|
[
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -337,6 +337,7 @@ let\ndune build src/proto_${branchInfo.protoName}/bin_accuser/tezos-accuser-${branchInfo.binarySuffix}.install\ndune build src/proto_${branchInfo.protoName}/bin_endorser/tezos-endorser-${branchInfo.binarySuffix}.install\ndune build src/bin_signer/tezos-signer.install\n+ dune build src/lib_protocol_compiler/tezos-protocol-compiler.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n@@ -356,6 +357,8 @@ let\n$out/bin/tezos-endorser-${branchInfo.binarySuffix}\n# tezos-signer\ncp _build/default/src/bin_signer/main_signer.exe $out/bin/tezos-signer\n+ # tezos-protocol-compiler\n+ cp _build/default/src/lib_protocol_compiler/main_native.exe $out/bin/tezos-protocol-compiler\n# Reuse license from tezos repo in packaging\ncp LICENSE $out/LICENSE\n# Compress binaries with upx\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-babylonnet.patch",
"new_path": "nix/fix-babylonnet.patch",
"diff": "@@ -96,3 +96,16 @@ index e4c9a7c..2a5f941 100644\n(alias\n(name runtest_lint)\n+diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n+index 1142419..d8086b4 100644\n+--- a/src/lib_protocol_compiler/dune\n++++ b/src/lib_protocol_compiler/dune\n+@@ -65,7 +65,7 @@\n+ (public_name tezos-protocol-compiler)\n+ (modes native)\n+ (libraries tezos_protocol_compiler_native)\n+- (flags (:standard -linkall))\n++ (flags (:standard -linkall -ccopt -static))\n+ (modules Main_native))\n+\n+ (executable\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "@@ -96,6 +96,19 @@ index c06413b..a81e206 100644\n(alias\n(name runtest_lint)\n+diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n+index 7d70857..9fbe9cc 100644\n+--- a/src/lib_protocol_compiler/dune\n++++ b/src/lib_protocol_compiler/dune\n+@@ -64,7 +64,7 @@\n+ (public_name tezos-protocol-compiler)\n+ (modes native)\n+ (libraries tezos_protocol_compiler_native)\n+- (flags (:standard -linkall))\n++ (flags (:standard -linkall -ccopt -static))\n+ (modules Main_native))\n+\n+ (executable\ndiff --git a/src/lib_base/p2p_addr.ml b/src/lib_base/p2p_addr.ml\nindex d9139c4b..a3af815c 100644\n--- a/src/lib_base/p2p_addr.ml\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Build `tezos-protocol-compiler`
|
603,652
|
10.12.2019 15:56:36
| -10,800
|
84f4c1ab88ce194093cbb3559c3f5bb5ff47d830
|
Pack static binaries in archive
Problem: There are a lot of tezos-related binaries, it is a bit
inconvenient to provide every binary as a single build artifact.
Solution: Pack binaries in `.tar.gz` archive and expose it as a build
artifact.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -15,16 +15,16 @@ steps:\nlabel: crossref-verify\nsoft_fail: true\n- commands:\n- - nix-build -A tezos-client-mainnet -o tezos-client-mainnet\n- - nix-build -A tezos-client-babylonnet -o tezos-client-babylonnet\n+ - nix-build -A mainnet-binaries -o mainnet-binaries\n+ - nix-build -A babylonnet-binaries -o babylonnet-binaries\n- nix-build -A mainnet-rpm-package -o mainnet-rpm-package --arg timestamp ${cur_date}\n- nix-build -A mainnet-deb-package -o mainnet-deb-package --arg timestamp ${cur_date}\n- nix-build -A babylonnet-rpm-package -o babylonnet-rpm-package --arg timestamp ${cur_date}\n- nix-build -A babylonnet-deb-package -o babylonnet-deb-package --arg timestamp ${cur_date}\nlabel: build and package\nartifact_paths:\n- - ./tezos-client-mainnet/*\n- - ./tezos-client-babylonnet/*\n+ - ./mainnet-binaries/*\n+ - ./babylonnet-binaries/*\n- ./mainnet-rpm-package/*\n- ./mainnet-deb-package/*\n- ./babylonnet-rpm-package/*\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -23,6 +23,23 @@ let\nstatic-nix = import ./nix/static.nix;\ntezos-static-mainnet = static-nix mainnet;\ntezos-static-babylonnet = static-nix babylonnet;\n+\n+ packDirectory = archiveName: pathToPack:\n+ stdenv.mkDerivation rec {\n+ name = \"${archiveName}.tar.gz\";\n+ phases = \"archivePhase\";\n+ nativeBuildInputs = [ gnutar ];\n+ archivePhase = ''\n+ mkdir -p $out\n+ tar -cvzf $out/${name} --mode='u+rwX' -C ${pathToPack} $(ls ${pathToPack})\n+ '';\n+ };\n+ mainnet-binaries = packDirectory \"mainnet-binaries-${mainnet.rev}\"\n+ \"${tezos-static-mainnet}/bin\";\n+ babylonnet-binaries =\n+ packDirectory \"babylonnet-binaries-${babylonnet.rev}\"\n+ \"${tezos-static-babylonnet}/bin\";\n+\nbinary-mainnet = \"${tezos-static-mainnet}/bin/tezos-client\";\nbinary-babylonnet = \"${tezos-static-babylonnet}/bin/tezos-client\";\npackageDesc-mainnet = {\n@@ -86,6 +103,6 @@ let\nin rec {\ninherit\n- mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package tezos-license\n- tezos-static-mainnet tezos-static-babylonnet;\n+ mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package\n+ mainnet-binaries babylonnet-binaries;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -343,7 +343,7 @@ let\nmkdir -p $out/bin\n# tezos-client and tezos-admin\ncp _build/default/src/bin_client/main_client.exe $out/bin/tezos-client\n- cp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-client-admin\n+ cp _build/default/src/bin_client/main_admin.exe $out/bin/tezos-admin-client\n# tezos-node\ncp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n# tezos-baker\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Pack static binaries in archive
Problem: There are a lot of tezos-related binaries, it is a bit
inconvenient to provide every binary as a single build artifact.
Solution: Pack binaries in `.tar.gz` archive and expose it as a build
artifact.
|
603,652
|
13.12.2019 15:22:01
| -10,800
|
211dec253debc7923f7e419b6c0c47142b5ec133
|
Package all new binaries
Problem: Now we build not only `tezos-client` but also other
tezos-related executables.
Solution: Pack them all in both `.rpm` and `.deb` packages.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -17,10 +17,8 @@ steps:\n- commands:\n- nix-build -A mainnet-binaries -o mainnet-binaries\n- nix-build -A babylonnet-binaries -o babylonnet-binaries\n- - nix-build -A mainnet-rpm-package -o mainnet-rpm-package --arg timestamp ${cur_date}\n- - nix-build -A mainnet-deb-package -o mainnet-deb-package --arg timestamp ${cur_date}\n- - nix-build -A babylonnet-rpm-package -o babylonnet-rpm-package --arg timestamp ${cur_date}\n- - nix-build -A babylonnet-deb-package -o babylonnet-deb-package --arg timestamp ${cur_date}\n+ - nix-build -A deb-packages -o deb-packages --arg timestamp ${cur_date}\n+ - nix-build -A rpm-packages -o rpm-packages --arg timestamp ${cur_date}\nlabel: build and package\nartifact_paths:\n- ./mainnet-binaries/*\n@@ -29,6 +27,8 @@ steps:\n- ./mainnet-deb-package/*\n- ./babylonnet-rpm-package/*\n- ./babylonnet-deb-package/*\n+ - ./deb-packages/*\n+ - ./rpm-packages/*\nbranches: !master\n- commands:\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "# SPDX-License-Identifier: MPL-2.0\nts := $(shell date +\"%Y%m%d%H%M\")\n-binary:\n- nix-build -A tezos-client-babylonnet -o tezos-client\n- cp tezos-client/tezos-client-babylonnet-* tezos-client-babylonnet\n- rm tezos-client\n+.PHONY: binaries binaries-mainnet rpm-packages deb-packages\n-binary-mainnet:\n- nix-build -A tezos-client-mainnet -o tezos-client\n- cp tezos-client/tezos-client-mainnet-* ./tezos-client-mainnet\n- rm tezos-client\n+binaries:\n+ cp $(shell nix-build -A babylonnet-binaries --no-out-link)/* ./\n-rpm:\n- nix-build -A babylonnet-rpm-package -o tezos-client-package --arg timestamp $(ts)\n- cp -a tezos-client-package/*.rpm .\n- rm tezos-client-package\n+binaries-mainnet:\n+ cp $(shell nix-build -A mainnet-binaries --no-out-link)/* ./\n-rpm-mainnet:\n- nix-build -A mainnet-rpm-package -o tezos-client-package --arg timestamp $(ts)\n- cp -a tezos-client-package/*.rpm .\n- rm tezos-client-package\n-\n-deb:\n- nix-build -A babylonnet-deb-package -o tezos-client-package --arg timestamp $(ts)\n- cp -a tezos-client-package/*.deb .\n- rm tezos-client-package\n-\n-deb-mainnet:\n- nix-build -A mainnet-deb-package -o tezos-client-package --arg timestamp $(ts)\n- cp -a tezos-client-package/*.deb .\n- rm tezos-client-package\n+rpm-packages:\n+ nix-build -A rpm-packages -o rpm-packages --arg timestamp $(ts)\n+deb-packages:\n+ nix-build -A deb-packages -o deb-packages --arg timestamp $(ts)\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -6,19 +6,21 @@ with pkgs;\nlet\nroot = ./.;\n- mainnet = rec {\n+ protocol005 = rec {\n+ protocolName = \"005_PsBabyM1\";\n+ binarySuffix = builtins.replaceStrings [ \"_\" ] [ \"-\" ] protocolName;\n+ };\n+ mainnet = {\nrev = \"94f779a7\";\nsha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\npatchFile = ./nix/fix-mainnet.patch;\n- protoName = \"005_PsBabyM1\";\n- binarySuffix = builtins.replaceStrings [\"_\"] [\"-\"] protoName;\n+ protocol = protocol005;\n};\n- babylonnet = rec {\n+ babylonnet = {\nrev = \"b8731913\";\nsha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\npatchFile = ./nix/fix-babylonnet.patch;\n- protoName = \"005_PsBabyM1\";\n- binarySuffix = builtins.replaceStrings [\"_\"] [\"-\"] protoName;\n+ protocol = protocol005;\n};\nstatic-nix = import ./nix/static.nix;\ntezos-static-mainnet = static-nix mainnet;\n@@ -39,59 +41,70 @@ let\nbabylonnet-binaries =\npackDirectory \"babylonnet-binaries-${babylonnet.rev}\"\n\"${tezos-static-babylonnet}/bin\";\n+ licenseFile = \"${tezos-static-mainnet}/LICENSE\";\n- binary-mainnet = \"${tezos-static-mainnet}/bin/tezos-client\";\n- binary-babylonnet = \"${tezos-static-babylonnet}/bin/tezos-client\";\n- packageDesc-mainnet = {\n- inherit licenseFile;\n- project = \"tezos-client-mainnet\";\n+ mkPackageDescs = { executableName, binPath, description }@executableDesc:\n+ let\n+ mainnetDesc = {\n+ inherit description;\n+ bin = \"${tezos-static-mainnet}/${binPath}\";\n+ gitRevision = mainnet.rev;\n+ project = \"${executableName}-mainnet\";\nversion = toString timestamp;\n- bin = binary-mainnet;\narch = \"amd64\";\n- license = \"MIT\";\n+ license = \"MPL-2.0\";\ndependencies = \"\";\nmaintainer = \"Serokell https://serokell.io\";\n- description = \"CLI client for interacting with tezos blockchain\";\n- gitRevision = mainnet.rev;\n+ licenseFile = \"${tezos-static-mainnet}/LICENSE\";\nbranchName = \"mainnet\";\n};\n-\n- packageDesc-babylonnet = packageDesc-mainnet // {\n- project = \"tezos-client-babylonnet\";\n- bin = binary-babylonnet;\n+ babylonnetDesc = mainnetDesc // {\n+ bin = \"${tezos-static-babylonnet}/${binPath}\";\n+ project = \"${executableName}-babylonnet\";\ngitRevision = babylonnet.rev;\nbranchName = \"babylonnet\";\n};\n+ in [ mainnetDesc babylonnetDesc ];\n- buildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile dpkg; };\n- buildRpm = packageDesc:\n- import ./packageRpm.nix { inherit stdenv writeTextFile gnutar rpm buildFHSUserEnv; }\n- (packageDesc // { arch = \"x86_64\"; });\n-\n- mainnet-rpm-package = buildRpm packageDesc-mainnet;\n-\n- mainnet-deb-package = buildDeb packageDesc-mainnet;\n-\n- babylonnet-rpm-package = buildRpm packageDesc-babylonnet;\n-\n- babylonnet-deb-package = buildDeb packageDesc-babylonnet;\n+ tezos-executables = [\n+ {\n+ executableName = \"tezos-client\";\n+ binPath = \"/bin/tezos-client\";\n+ description = \"CLI client for interacting with tezos blockchain\";\n+ }\n+ {\n+ executableName = \"tezos-admin-client\";\n+ binPath = \"/bin/tezos-admin-client\";\n+ description = \"Administration tool for the node\";\n+ }\n+ {\n+ executableName = \"tezos-node\";\n+ binPath = \"/bin/tezos-node\";\n+ description =\n+ \"Entry point for initializing, configuring and running a Tezos node\";\n+ }\n+ {\n+ executableName = \"tezos-baker\";\n+ binPath = \"/bin/tezos-baker-${protocol005.binarySuffix}\";\n+ description = \"Daemon for baking\";\n+ }\n+ {\n+ executableName = \"tezos-accuser\";\n+ binPath = \"/bin/tezos-accuser-${protocol005.binarySuffix}\";\n+ description = \"Daemon for accusing\";\n+ }\n+ {\n+ executableName = \"tezos-endorser\";\n+ binPath = \"/bin/tezos-endorser-${protocol005.binarySuffix}\";\n+ description = \"Daemon for endorsing\";\n+ }\n+ {\n+ executableName = \"tezos-signer\";\n+ binPath = \"/bin/tezos-signer\";\n+ description = \"A client to remotely sign operations or blocks\";\n+ }\n+ ];\n- tezos-client-mainnet = stdenv.mkDerivation rec {\n- name = \"tezos-client-mainnet-${mainnet.rev}\";\n- phases = \"copyPhase\";\n- copyPhase = ''\n- mkdir -p $out\n- cp ${binary-mainnet} $out/${name}\n- '';\n- };\n- tezos-client-babylonnet = stdenv.mkDerivation rec {\n- name = \"tezos-client-babylonnet-${babylonnet.rev}\";\n- phases = \"copyPhase\";\n- copyPhase = ''\n- mkdir -p $out\n- cp ${binary-babylonnet} $out/${name}\n- '';\n- };\ntezos-license = stdenv.mkDerivation rec {\nname = \"LICENSE\";\nphases = \"copyPhase\";\n@@ -101,8 +114,29 @@ let\n'';\n};\n+ packageDescs = lib.flatten (map mkPackageDescs tezos-executables);\n+\n+ buildDeb = import ./packageDeb.nix { inherit stdenv writeTextFile dpkg; };\n+ buildRpm = packageDesc:\n+ import ./packageRpm.nix {\n+ inherit stdenv writeTextFile gnutar rpm buildFHSUserEnv;\n+ } (packageDesc // { arch = \"x86_64\"; });\n+\n+ moveDerivations = name: drvs:\n+ stdenv.mkDerivation rec {\n+ inherit name drvs;\n+\n+ buildCommand = ''\n+ mkdir -p $out\n+ for drv in $drvs; do\n+ cp $drv/* $out\n+ done\n+ '';\n+ };\n+\n+ deb-packages = moveDerivations \"deb-packages\" (map buildDeb packageDescs);\n+ rpm-packages = moveDerivations \"rpm-packages\" (map buildRpm packageDescs);\n+\nin rec {\n- inherit\n- mainnet-rpm-package babylonnet-rpm-package babylonnet-deb-package\n- mainnet-binaries babylonnet-binaries;\n+ inherit deb-packages rpm-packages mainnet-binaries babylonnet-binaries tezos-license;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -333,9 +333,9 @@ let\nPATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.07.1/bin\ndune build src/bin_client/tezos-client.install\ndune build src/bin_node/tezos-node.install\n- dune build src/proto_${branchInfo.protoName}/bin_baker/tezos-baker-${branchInfo.binarySuffix}.install\n- dune build src/proto_${branchInfo.protoName}/bin_accuser/tezos-accuser-${branchInfo.binarySuffix}.install\n- dune build src/proto_${branchInfo.protoName}/bin_endorser/tezos-endorser-${branchInfo.binarySuffix}.install\n+ dune build src/proto_${branchInfo.protocol.protocolName}/bin_baker/tezos-baker-${branchInfo.protocol.binarySuffix}.install\n+ dune build src/proto_${branchInfo.protocol.protocolName}/bin_accuser/tezos-accuser-${branchInfo.protocol.binarySuffix}.install\n+ dune build src/proto_${branchInfo.protocol.protocolName}/bin_endorser/tezos-endorser-${branchInfo.protocol.binarySuffix}.install\ndune build src/bin_signer/tezos-signer.install\ndune build src/lib_protocol_compiler/tezos-protocol-compiler.install\n'';\n@@ -347,14 +347,14 @@ let\n# tezos-node\ncp _build/default/src/bin_node/main.exe $out/bin/tezos-node\n# tezos-baker\n- cp _build/default/src/proto_${branchInfo.protoName}/bin_baker/main_baker_${branchInfo.protoName}.exe \\\n- $out/bin/tezos-baker-${branchInfo.binarySuffix}\n+ cp _build/default/src/proto_${branchInfo.protocol.protocolName}/bin_baker/main_baker_${branchInfo.protocol.protocolName}.exe \\\n+ $out/bin/tezos-baker-${branchInfo.protocol.binarySuffix}\n# tezos-accuser\n- cp _build/default/src/proto_${branchInfo.protoName}/bin_accuser/main_accuser_${branchInfo.protoName}.exe \\\n- $out/bin/tezos-accuser-${branchInfo.binarySuffix}\n+ cp _build/default/src/proto_${branchInfo.protocol.protocolName}/bin_accuser/main_accuser_${branchInfo.protocol.protocolName}.exe \\\n+ $out/bin/tezos-accuser-${branchInfo.protocol.binarySuffix}\n# tezos-endorser\n- cp _build/default/src/proto_${branchInfo.protoName}/bin_endorser/main_endorser_${branchInfo.protoName}.exe \\\n- $out/bin/tezos-endorser-${branchInfo.binarySuffix}\n+ cp _build/default/src/proto_${branchInfo.protocol.protocolName}/bin_endorser/main_endorser_${branchInfo.protocol.protocolName}.exe \\\n+ $out/bin/tezos-endorser-${branchInfo.protocol.binarySuffix}\n# tezos-signer\ncp _build/default/src/bin_signer/main_signer.exe $out/bin/tezos-signer\n# tezos-protocol-compiler\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Package all new binaries
Problem: Now we build not only `tezos-client` but also other
tezos-related executables.
Solution: Pack them all in both `.rpm` and `.deb` packages.
|
603,652
|
19.12.2019 13:37:13
| -10,800
|
7505c0c08e1d725cc750c908629556bd03dbe6c5
|
Optional build `.src.rpm`
Problem: `.src.rpm` are used for uploading to Copr repository.
It doesn't make much sense to distribute them along with `.rpm`
packages.
Solution: Optionally build them using buildSourcePackage attribute
in `packageRpm.nix`.
|
[
{
"change_type": "MODIFY",
"old_path": "packageRpm.nix",
"new_path": "packageRpm.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ stdenv, writeTextFile, gnutar, rpm, buildFHSUserEnv }:\n+{ stdenv, writeTextFile, gnutar, rpm, buildFHSUserEnv\n+, buildSourcePackage ? false }:\npkgDesc:\nlet\n@@ -62,6 +63,7 @@ let\n};\nin stdenv.mkDerivation rec {\n+ rpmBuildFlag = if buildSourcePackage then \"-ba\" else \"-bb\";\nname = \"${pkgName}.rpm\";\nphases = \"packagePhase\";\n@@ -78,9 +80,9 @@ in stdenv.mkDerivation rec {\ncp ${sourceArchive} SOURCES/${sourceArchive.name}\nmkdir -p BUILD/${project}\ncp ${licenseFile} BUILD/${project}/LICENSE\n- rpmbuild-env -ba SPECS/${project}.spec --define '_bindir /usr/bin' --define '_datadir /usr/share'\n+ rpmbuild-env ${rpmBuildFlag} SPECS/${project}.spec --define '_bindir /usr/bin' --define '_datadir /usr/share'\nmkdir -p $out\n- cp SRPMS/*.src.rpm $out/\n+ ${if buildSourcePackage then \"cp SRPMS/*.src.rpm $out/\" else \"\"}\ncp RPMS/*/*.rpm $out/\n'';\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Optional build `.src.rpm`
Problem: `.src.rpm` are used for uploading to Copr repository.
It doesn't make much sense to distribute them along with `.rpm`
packages.
Solution: Optionally build them using buildSourcePackage attribute
in `packageRpm.nix`.
|
603,652
|
15.01.2020 12:52:37
| -10,800
|
6663aa15b88f442db00c160b80989a8804f5f0f4
|
Update autorelease script
Problem: Now we have more binaries to release, they are store in tar
archive.
Solution: Update autorelease script, so that it unarchive binaries add
babylonnet/mainnet suffix to their names and add them to the release
assets. Also now binaries won't have commit hash in the name.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -36,10 +36,10 @@ let\ntar -cvzf $out/${name} --mode='u+rwX' -C ${pathToPack} $(ls ${pathToPack})\n'';\n};\n- mainnet-binaries = packDirectory \"mainnet-binaries-${mainnet.rev}\"\n+ mainnet-binaries = packDirectory \"binaries-mainnet-${mainnet.rev}\"\n\"${tezos-static-mainnet}/bin\";\nbabylonnet-binaries =\n- packDirectory \"babylonnet-binaries-${babylonnet.rev}\"\n+ packDirectory \"binaries-babylonnet-${babylonnet.rev}\"\n\"${tezos-static-babylonnet}/bin\";\nlicenseFile = \"${tezos-static-mainnet}/LICENSE\";\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "#!/usr/bin/env nix-shell\n-#!nix-shell -p gitAndTools.hub git -i bash\n+#!nix-shell -p gitAndTools.hub git rename -i bash\n# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n@@ -9,9 +9,27 @@ project=$(basename $(pwd))\n# The directory in which artifacts will be created\nTEMPDIR=`mktemp -d`\n+assets_dir=$TEMPDIR/assets\n# Build release.nix\nnix-build release.nix -o $TEMPDIR/$project --arg timestamp $(date +\\\"%Y%m%d%H%M\\\")\n+mkdir -p $assets_dir\n+# Create archives with deb and rpm packages\n+tar -cvzf $assets_dir/packages-deb.tar.gz --mode='u+rwX' -C $TEMPDIR/$project $(cd $TEMPDIR/$project && ls *.deb)\n+tar -cvzf $assets_dir/packages-rpm.tar.gz --mode='u+rwX' -C $TEMPDIR/$project $(cd $TEMPDIR/$project && ls *.rpm)\n+# Move these archives to assets\n+cp $TEMPDIR/$project/*.tar.gz $assets_dir\n+cp $TEMPDIR/$project/LICENSE $assets_dir\n+# Unpack binaries\n+mkdir -p $assets_dir/binaries-babylonnet $assets_dir/binaries-mainnet\n+tar -C $assets_dir/binaries-mainnet -xvzf $TEMPDIR/$project/binaries-mainnet-*.tar.gz\n+tar -C $assets_dir/binaries-babylonnet -xvzf $TEMPDIR/$project/binaries-babylonnet-*.tar.gz\n+# Add corresponding babylonnet or mainnet suffixes\n+rename 's/(.*)$/$1-babylonnet/' $assets_dir/binaries-babylonnet/*\n+rename 's/(.*)$/$1-mainnet/' $assets_dir/binaries-mainnet/*\n+# Move renamed binaries to assets\n+mv $assets_dir/binaries-*/* $assets_dir/\n+rm -r $assets_dir/*/\n# Delete release\nhub release delete auto-release\n@@ -23,7 +41,7 @@ git push --force --tags\n# Combine all assets\nassets=\"\"\n-for file in $TEMPDIR/$project/*; do\n+for file in $assets_dir/*; do\nassets+=\"-a $file \"\ndone\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#14] Update autorelease script
Problem: Now we have more binaries to release, they are store in tar
archive.
Solution: Update autorelease script, so that it unarchive binaries add
babylonnet/mainnet suffix to their names and add them to the release
assets. Also now binaries won't have commit hash in the name.
|
603,652
|
28.01.2020 15:51:02
| -10,800
|
2d5b6f36977c85ba43d42cf88b9f3f844ea7f7a5
|
Add release notes for autorelease
Problem: One can be confused by huge amount of release assets.
Solution: Add some assets description in the README and refer to
this section in release notes.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -18,8 +18,37 @@ Recomended way to get these binaries is to download them from assets from github\nGo to the [latest release](https://github.com/serokell/tezos-packaging/releases/latest)\nand download desired assets.\n+We provide both individual and archived binaries for mainnet and babylonnet versions\n+in order to be able to have static links for these binaries, also make it convenient\n+to download single binary or obtain all binaries in one click.\n+\n+Individual binaries (as well as Ubuntu/Fedora packages) have `mainnet/babylonnet` suffix\n+so that users can easily distinguish different branch versions. Some of the binaries names\n+also contain protocol name in consistence with binaries that can be produced from source\n+code using suggested [build instructions](https://tezos.gitlab.io/introduction/howtoget.html#build-from-sources).\n+\n+\n+In addition to the binaries we provide all `.deb` and `.rpm` packages in `.tar.gz` archives\n+for those who want to install them using local `.deb` or `.rpm` file.\n+However, recommended way is to use remote Ubuntu or Fedora package repository,\n+see [PPA](#ppa) and [Copr](#copr) for more information about remote package repositories.\n+\n+Contents of release:\n+* `tezos-*-mainnet` static binaries based on mainnet branch.\n+* `tezos-*-babylonnet` static binaries based babylonnet branch.\n+* `packages-deb.tar.gz` `.deb` packages for both mainnet and babylonnet versions,\n+it is recommended to use `apt` to install packages directly from remote repository.\n+* `packages-rpm.tar.gz` `.rpm` packages for both mainnet and babylonnet versions,\n+it is recommended to use `dnf` to install packages directly from remote repository.\n+* `binaries-babylonnet-<revision>.tar.gz` archive with all babylonnet\n+based binaries made from particular branch revision.\n+* `binaries-babylonnet-<revision>.tar.gz` archive with all mainnet based\n+binaries made from particular branch revision.\n+* License file from [tezos repository](https://gitlab.com/tezos/tezos/).\n+\n## Ubuntu (Debian based distros) usage\n+<a name=\"ppa\"></a>\n### Use PPA with `tezos-*` binaries\nIf you are using Ubuntu you can use PPA in order to install `tezos-*` executables.\n@@ -41,6 +70,7 @@ sudo apt install <path to deb file>\n## Fedora (Red Hat) usage\n+<a name=\"copr\"></a>\n### Use copr package with `tezos-*` binaries\nIf you are using Fedora you can use Copr in order to install `tezos-*`\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -38,8 +38,7 @@ let\n};\nmainnet-binaries = packDirectory \"binaries-mainnet-${mainnet.rev}\"\n\"${tezos-static-mainnet}/bin\";\n- babylonnet-binaries =\n- packDirectory \"binaries-babylonnet-${babylonnet.rev}\"\n+ babylonnet-binaries = packDirectory \"binaries-babylonnet-${babylonnet.rev}\"\n\"${tezos-static-babylonnet}/bin\";\nlicenseFile = \"${tezos-static-mainnet}/LICENSE\";\n@@ -137,6 +136,25 @@ let\ndeb-packages = moveDerivations \"deb-packages\" (map buildDeb packageDescs);\nrpm-packages = moveDerivations \"rpm-packages\" (map buildRpm packageDescs);\n+ releaseFile = writeTextFile {\n+ name = \"release-notes.md\";\n+ text = ''\n+ Automatic release on ${builtins.substring 0 8 timestamp}\n+\n+ This release contains assets based on [${babylonnet.rev} revision](https://gitlab.com/tezos/tezos/tree/${babylonnet.rev}) of babylonnet branch and\n+ [${mainnet.rev} revision](https://gitlab.com/tezos/tezos/tree/${mainnet.rev}) of mainnet branch from [tezos repository](https://gitlab.com/tezos/tezos/).\n+ <!--\n+ When making a new release, replace `auto-release` with actual release tag:\n+ -->\n+ For more information about release assets see [README section](https://github.com/serokell/tezos-packaging/blob/auto-release/README.md#obtain-binaries-or-packages-from-github-release).\n+ '';\n+ };\n+ releaseNotes = runCommand \"release-notes\" {} ''\n+ mkdir -p $out\n+ cp ${releaseFile} $out/\n+ '';\n+\nin rec {\n- inherit deb-packages rpm-packages mainnet-binaries babylonnet-binaries tezos-license;\n+ inherit deb-packages rpm-packages mainnet-binaries babylonnet-binaries\n+ tezos-license releaseNotes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -46,4 +46,4 @@ for file in $assets_dir/*; do\ndone\n# Create release\n-hub release create $assets -m \"Automatic build on $(date -I)\" --prerelease auto-release\n+hub release create $assets -F $TEMPDIR/$project/*-release-notes.md --prerelease auto-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#27] Add release notes for autorelease
Problem: One can be confused by huge amount of release assets.
Solution: Add some assets description in the README and refer to
this section in release notes.
|
603,652
|
29.01.2020 15:37:31
| -10,800
|
5f74807f5e3635b3cc12c863a45b974ee70dc5d7
|
Bump tezos branch revisions
Problem: Current revision that are built and packed are quiet old.
Solution: Update them to the newest existing ones.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -11,14 +11,14 @@ let\nbinarySuffix = builtins.replaceStrings [ \"_\" ] [ \"-\" ] protocolName;\n};\nmainnet = {\n- rev = \"94f779a7\";\n- sha256 = \"16lxilng5q8fr2ll6h4hf7wlvac6nmw4cx10cbgzj5ks090bl97r\";\n+ rev = \"28309c81\";\n+ sha256 = \"11cv76yfal572fhnhynkbga7wrdx5x1vym11is2xwlygn4p2dx2n\";\npatchFile = ./nix/fix-mainnet.patch;\nprotocol = protocol005;\n};\nbabylonnet = {\n- rev = \"b8731913\";\n- sha256 = \"1pakf1s6bg76fq42mb8fj1immz9g9wwimd522cpx8k28zf0hkl5i\";\n+ rev = \"12002a35\";\n+ sha256 = \"0j0xiicdid7wnygh9nlp0d2p57wgrbfglyfz56r8wx93s2q2m2c8\";\npatchFile = ./nix/fix-babylonnet.patch;\nprotocol = protocol005;\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -272,12 +272,33 @@ let\n'';\ndoCheck = false;\n}) { };\n+ ezjsonm = super.ezjsonm.overrideDerivation (o: rec {\n+ version = \"1.1.0\";\n+ name = \"ezjsonm\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"mirage\";\n+ repo = \"ezjsonm\";\n+ rev = \"v${version}\";\n+ sha256 = \"064j9pzy01p3dv947khqyn7fkjbs3jmrqsg8limb4abnlaqxxs2s\";\n+ };\n+ });\n+ fmt = super.fmt.overrideDerivation (o: rec {\n+ version = \"0.8.8\";\n+ name = \"fmt\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"dbuenzli\";\n+ repo = \"fmt\";\n+ rev = \"v${version}\";\n+ sha256 = \"06700rk442hn2yss04aqv2pr3c0l88zvv6sbwq0hg0fyyacmapl7\";\n+ };\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.stdlib-shims self.seq ];\n+ });\ntezos = self.callPackage ({ stdenv, fetchgit, buildDunePackage, base\n, bigstring, cohttp-lwt, cohttp-lwt-unix, cstruct, ezjsonm, hex, ipaddr\n- , js_of_ocaml, cmdliner, easy-format, tls, lwt4, lwt_log\n- , mtime, ocplib-endian, ptime, re, rresult, stdio, uri, uutf, zarith\n- , libusb1, hidapi, gmp, irmin, alcotest, dum, genspio, ocamlgraph, findlib\n+ , js_of_ocaml, cmdliner, easy-format, tls, lwt4, lwt_log, mtime\n+ , ocplib-endian, ptime, re, rresult, stdio, uri, uutf, zarith, libusb1\n+ , hidapi, gmp, irmin, alcotest, dum, genspio, ocamlgraph, findlib\n, digestif, ocp-ocamlres, pprint, upx }:\nbuildDunePackage rec {\npname = \"tezos\";\n@@ -331,13 +352,11 @@ let\nbuildPhase = ''\n# tezos-node build requires ocp-ocamlres binary in PATH\nPATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.07.1/bin\n- dune build src/bin_client/tezos-client.install\n- dune build src/bin_node/tezos-node.install\n- dune build src/proto_${branchInfo.protocol.protocolName}/bin_baker/tezos-baker-${branchInfo.protocol.binarySuffix}.install\n- dune build src/proto_${branchInfo.protocol.protocolName}/bin_accuser/tezos-accuser-${branchInfo.protocol.binarySuffix}.install\n- dune build src/proto_${branchInfo.protocol.protocolName}/bin_endorser/tezos-endorser-${branchInfo.protocol.binarySuffix}.install\n- dune build src/bin_signer/tezos-signer.install\n- dune build src/lib_protocol_compiler/tezos-protocol-compiler.install\n+ dune build src/bin_client/tezos-client.install src/bin_node/tezos-node.install \\\n+ src/proto_${branchInfo.protocol.protocolName}/bin_baker/tezos-baker-${branchInfo.protocol.binarySuffix}.install \\\n+ src/proto_${branchInfo.protocol.protocolName}/bin_accuser/tezos-accuser-${branchInfo.protocol.binarySuffix}.install \\\n+ src/proto_${branchInfo.protocol.protocolName}/bin_endorser/tezos-endorser-${branchInfo.protocol.binarySuffix}.install \\\n+ src/bin_signer/tezos-signer.install src/lib_protocol_compiler/tezos-protocol-compiler.install\n'';\ninstallPhase = ''\nmkdir -p $out/bin\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-mainnet.patch",
"new_path": "nix/fix-mainnet.patch",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\ndiff --git a/src/bin_client/dune b/src/bin_client/dune\n-index f42b53e6..7e47c074 100644\n+index fa4ace8..18caca5 100644\n--- a/src/bin_client/dune\n+++ b/src/bin_client/dune\n-@@ -28,7 +28,10 @@\n+@@ -31,7 +31,10 @@\n-open Tezos_client_base\n-open Tezos_client_commands\n-open Tezos_client_base_unix\n@@ -17,29 +17,43 @@ index f42b53e6..7e47c074 100644\n(install\n(section bin)\n-diff --git a/src/bin_node/dune b/src/bin_node/dune\n-index 54920a2..8bd54be 100644\n---- a/src/bin_node/dune\n-+++ b/src/bin_node/dune\n-@@ -28,7 +28,9 @@\n- -open Tezos_validator\n- -open Tezos_shell_context\n- -open Tezos_protocol_updater\n-- -linkall)))\n-+ -linkall\n+diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n+index e4c9a7c..2a5f941 100644\n+--- a/src/bin_signer/dune\n++++ b/src/bin_signer/dune\n+@@ -19,7 +19,10 @@\n+ -open Tezos_rpc_http_server\n+ -open Tezos_rpc_http_client_unix\n+ -open Tezos_stdlib_unix\n+- -open Tezos_stdlib)))\n++ -open Tezos_stdlib\n+ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n- (install\n- (section bin)\n-diff --git a/src/proto_005_PsBabyM1/bin_baker/dune b/src/proto_005_PsBabyM1/bin_baker/dune\n-index 755e8d4..aeb8f2d 100644\n---- a/src/proto_005_PsBabyM1/bin_baker/dune\n-+++ b/src/proto_005_PsBabyM1/bin_baker/dune\n-@@ -9,7 +9,10 @@\n- -open Tezos_client_005_PsBabyM1\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n+index 1142419..d8086b4 100644\n+--- a/src/lib_protocol_compiler/dune\n++++ b/src/lib_protocol_compiler/dune\n+@@ -65,7 +65,7 @@\n+ (public_name tezos-protocol-compiler)\n+ (modes native)\n+ (libraries tezos_protocol_compiler_native)\n+- (flags (:standard -linkall))\n++ (flags (:standard -linkall -ccopt -static))\n+ (modules Main_native))\n+\n+ (executable\n+diff --git a/src/proto_005_PsBabyM1/bin_accuser/dune b/src/proto_005_PsBabyM1/bin_accuser/dune\n+index 2f2a6fd..fd9773b 100644\n+--- a/src/proto_005_PsBabyM1/bin_accuser/dune\n++++ b/src/proto_005_PsBabyM1/bin_accuser/dune\n+@@ -10,7 +10,10 @@\n-open Tezos_client_commands\n-open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n@@ -48,14 +62,14 @@ index 755e8d4..aeb8f2d 100644\n(alias\n(name runtest_lint)\n-diff --git a/src/proto_005_PsBabyM1/bin_accuser/dune b/src/proto_005_PsBabyM1/bin_accuser/dune\n-index 173ab99..eae42b2 100644\n---- a/src/proto_005_PsBabyM1/bin_accuser/dune\n-+++ b/src/proto_005_PsBabyM1/bin_accuser/dune\n-@@ -9,7 +9,10 @@\n- -open Tezos_client_005_PsBabyM1\n+diff --git a/src/proto_005_PsBabyM1/bin_baker/dune b/src/proto_005_PsBabyM1/bin_baker/dune\n+index 1414a08..6044401 100644\n+--- a/src/proto_005_PsBabyM1/bin_baker/dune\n++++ b/src/proto_005_PsBabyM1/bin_baker/dune\n+@@ -10,7 +10,10 @@\n-open Tezos_client_commands\n-open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n@@ -65,13 +79,13 @@ index 173ab99..eae42b2 100644\n(alias\n(name runtest_lint)\ndiff --git a/src/proto_005_PsBabyM1/bin_endorser/dune b/src/proto_005_PsBabyM1/bin_endorser/dune\n-index 9df7abf..e8402b8 100644\n+index d1b60c7..a738ef2 100644\n--- a/src/proto_005_PsBabyM1/bin_endorser/dune\n+++ b/src/proto_005_PsBabyM1/bin_endorser/dune\n-@@ -9,7 +9,10 @@\n- -open Tezos_client_005_PsBabyM1\n+@@ -10,7 +10,10 @@\n-open Tezos_client_commands\n-open Tezos_baking_005_PsBabyM1_commands\n+ -open Tezos_stdlib_unix\n- -open Tezos_client_base_unix)))\n+ -open Tezos_client_base_unix\n+ -ccopt -static\n@@ -80,60 +94,13 @@ index 9df7abf..e8402b8 100644\n(alias\n(name runtest_lint)\n-diff --git a/src/bin_signer/dune b/src/bin_signer/dune\n-index c06413b..a81e206 100644\n---- a/src/bin_signer/dune\n-+++ b/src/bin_signer/dune\n-@@ -18,7 +18,10 @@\n- -open Tezos_rpc_http\n- -open Tezos_rpc_http_server\n- -open Tezos_rpc_http_client_unix\n-- -open Tezos_stdlib_unix)))\n-+ -open Tezos_stdlib_unix\n-+ -ccopt -static\n-+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n-+ )))\n-\n- (alias\n- (name runtest_lint)\n-diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n-index 7d70857..9fbe9cc 100644\n---- a/src/lib_protocol_compiler/dune\n-+++ b/src/lib_protocol_compiler/dune\n-@@ -64,7 +64,7 @@\n- (public_name tezos-protocol-compiler)\n- (modes native)\n- (libraries tezos_protocol_compiler_native)\n-- (flags (:standard -linkall))\n-+ (flags (:standard -linkall -ccopt -static))\n- (modules Main_native))\n-\n- (executable\n-diff --git a/src/lib_base/p2p_addr.ml b/src/lib_base/p2p_addr.ml\n-index d9139c4b..a3af815c 100644\n---- a/src/lib_base/p2p_addr.ml\n-+++ b/src/lib_base/p2p_addr.ml\n-@@ -36,8 +36,8 @@ let encoding =\n- end\n- ~binary:begin\n- conv\n-- Ipaddr.V6.to_bytes\n-- Ipaddr.V6.of_bytes_exn\n-+ Ipaddr.V6.to_octets\n-+ Ipaddr.V6.of_octets_exn\n- string\n- end\n-\n-diff --git a/src/lib_protocol_environment/tezos_protocol_environment.ml b/src/lib_protocol_environment/tezos_protocol_environment.ml\n-index 14acf631..7b0efcd8 100644\n---- a/src/lib_protocol_environment/tezos_protocol_environment.ml\n-+++ b/src/lib_protocol_environment/tezos_protocol_environment.ml\n-@@ -300,7 +300,7 @@ module MakeV1 (Param : sig val name: string end) () = struct\n- let to_bits ?(pad_to = 0) z =\n- let bits = to_bits z in\n- let len = Pervasives.((numbits z + 7) / 8) in\n-- let full_len = Compare.Int.max pad_to len in\n-+ let full_len = Stdlib.max pad_to len in\n- if full_len = 0 then\n- MBytes.empty\n- else\n\\ No newline at end of file\n+diff --git a/vendors/index/src/unix/dune b/vendors/index/src/unix/dune\n+index 2981490..655fa7f 100644\n+--- a/vendors/index/src/unix/dune\n++++ b/vendors/index/src/unix/dune\n+@@ -2,4 +2,4 @@\n+ (public_name index.unix)\n+ (name index_unix)\n+ (c_names pread pwrite)\n+- (libraries index logs logs.threaded threads unix))\n++ (libraries index logs threads unix))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Bump tezos branch revisions
Problem: Current revision that are built and packed are quiet old.
Solution: Update them to the newest existing ones.
|
603,652
|
07.02.2020 11:22:44
| -10,800
|
9eb4fc01fd6d1656262f3aaea15a97e626a629ef
|
Update autorelease script
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "# SPDX-License-Identifier: MPL-2.0\n# Project name, inferred from repository name\n-project=$(basename $(pwd))\n+project=$(basename \"$(pwd)\")\n# The directory in which artifacts will be created\n-TEMPDIR=`mktemp -d`\n+TEMPDIR=$(mktemp -d)\nassets_dir=$TEMPDIR/assets\n# Build release.nix\n-nix-build release.nix -o $TEMPDIR/$project --arg timestamp $(date +\\\"%Y%m%d%H%M\\\")\n-mkdir -p $assets_dir\n+nix-build release.nix -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\"\n+mkdir -p \"$assets_dir\"\n# Create archives with deb and rpm packages\n-tar -cvzf $assets_dir/packages-deb.tar.gz --mode='u+rwX' -C $TEMPDIR/$project $(cd $TEMPDIR/$project && ls *.deb)\n-tar -cvzf $assets_dir/packages-rpm.tar.gz --mode='u+rwX' -C $TEMPDIR/$project $(cd $TEMPDIR/$project && ls *.rpm)\n+tar -cvzf \"$assets_dir\"/packages-deb.tar.gz --mode='u+rwX' -C \"$TEMPDIR\"/\"$project\" $(cd \"$TEMPDIR\"/\"$project\" && ls *.deb)\n+tar -cvzf \"$assets_dir\"/packages-rpm.tar.gz --mode='u+rwX' -C \"$TEMPDIR\"/\"$project\" $(cd \"$TEMPDIR\"/\"$project\" && ls *.rpm)\n# Move these archives to assets\n-cp $TEMPDIR/$project/*.tar.gz $assets_dir\n-cp $TEMPDIR/$project/LICENSE $assets_dir\n+cp \"$TEMPDIR\"/\"$project\"/*.tar.gz \"$assets_dir\"\n+cp \"$TEMPDIR\"/\"$project\"/LICENSE \"$assets_dir\"\n# Unpack binaries\n-mkdir -p $assets_dir/binaries-babylonnet $assets_dir/binaries-mainnet\n-tar -C $assets_dir/binaries-mainnet -xvzf $TEMPDIR/$project/binaries-mainnet-*.tar.gz\n-tar -C $assets_dir/binaries-babylonnet -xvzf $TEMPDIR/$project/binaries-babylonnet-*.tar.gz\n-# Add corresponding babylonnet or mainnet suffixes\n-rename 's/(.*)$/$1-babylonnet/' $assets_dir/binaries-babylonnet/*\n-rename 's/(.*)$/$1-mainnet/' $assets_dir/binaries-mainnet/*\n-# Move renamed binaries to assets\n-mv $assets_dir/binaries-*/* $assets_dir/\n-rm -r $assets_dir/*/\n+tar -C \"$assets_dir\" -xvzf \"$TEMPDIR\"/\"$project\"/binaries-*.tar.gz\n# Delete release\nhub release delete auto-release\n@@ -40,10 +32,11 @@ git tag -f auto-release\ngit push --force --tags\n# Combine all assets\n-assets=\"\"\n+assets=()\nfor file in $assets_dir/*; do\n- assets+=\"-a $file \"\n+ echo $file\n+ assets+=(\"-a\" $file)\ndone\n# Create release\n-hub release create $assets -F $TEMPDIR/$project/*-release-notes.md --prerelease auto-release\n+hub release create \"${assets[@]}\" -F \"$TEMPDIR\"/\"$project\"/*-release-notes.md --prerelease auto-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#30] Update autorelease script
|
603,652
|
13.02.2020 11:25:37
| -10,800
|
20c6fb4158a21add118c221f142a35a5251efb18
|
Update README
Problem: After recent update README has some amount on nonsense.
Solution: Rereade it and update.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -40,13 +40,12 @@ see [PPA](#ppa) and [Copr](#copr) for more information about remote package repo\nContents of release:\n* `tezos-*-005-PsBabyM1` static binaries for 005 protocol.\n* `tezos-*-006-PsCARTHA` static binaries for 006 protocol.\n-* `packages-deb.tar.gz` `.deb` packages for both mainnet and babylonnet versions,\n+* `packages-deb.tar.gz` `.deb` packages with binaries built from master branch sources,\nit is recommended to use `apt` to install packages directly from remote repository.\n-* `packages-rpm.tar.gz` `.rpm` packages for both mainnet and babylonnet versions,\n+* `packages-rpm.tar.gz` `.rpm` packages with binaries built from master branch sources,\nit is recommended to use `dnf` to install packages directly from remote repository.\n* `binaries-<revision>.tar.gz` archive with all binaries made from\nparticular master branch revision.\n-binaries made from particular branch revision.\n* License file from [tezos repository](https://gitlab.com/tezos/tezos/).\n## Ubuntu (Debian based distros) usage\n@@ -55,11 +54,13 @@ binaries made from particular branch revision.\n### Use PPA with `tezos-*` binaries\nIf you are using Ubuntu you can use PPA in order to install `tezos-*` executables.\n-E.g, in order to do install `tezos-client` run the following commands:\n+E.g, in order to do install `tezos-client` or `tezos-baker` run the following commands:\n```\nsudo add-apt-repository ppa:serokell/tezos && sudo apt-get update\nsudo apt-get install tezos-client\n-sudo apt-get install tezos-baker-005-PsBabyM1\n+# dpkg-source prohibits uppercase in the packages names so the protocol\n+# name is in lowercase\n+sudo apt-get install tezos-baker-005-psbabym1\n```\nOnce you install such packages the commands `tezos-*` will be available.\n@@ -78,7 +79,7 @@ sudo apt install <path to deb file>\nIf you are using Fedora you can use Copr in order to install `tezos-*`\nexecutables.\n-E.g. in order to install `tezos-client` run the following commands:\n+E.g. in order to install `tezos-client` or `tezos-baker` run the following commands:\n```\n# use dnf\nsudo dnf copr enable @Serokell/Tezos\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#30] Update README
Problem: After recent update README has some amount on nonsense.
Solution: Rereade it and update.
|
603,652
|
17.02.2020 19:14:10
| -10,800
|
31c7c200cf1c640d8949d85c0cc6906f37e2112f
|
Bump master revision
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -16,8 +16,8 @@ let\n};\nprotocols = [ protocol005 protocol006 ];\nmaster = {\n- rev = \"767de2b6\";\n- sha256 = \"1mvgyzb2w5p7r92y2zvq7awshz7xi9x5g5ncjyxzd3z7rkxpj5vb\";\n+ rev = \"60b977cd\";\n+ sha256 = \"1v9v5z5i3cs9jw48m3xx9w4fqkns37nn464fr7hds7wgmwfmf1sp\";\npatchFile = ./nix/fix-master.patch;\ninherit protocols;\n};\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#30] Bump master revision
|
603,652
|
20.02.2020 17:38:25
| -10,800
|
a13b9b262391eacdfaca909e8aa61070b4ecd5aa
|
Make tezos patches configurable
Problem: In one of our projects we want to provide batched static
tezos-binaries.
Solution: Make patches configurable.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\" }:\n+{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\", patches ? [] }:\nwith pkgs;\nlet\n@@ -18,7 +18,7 @@ let\nmaster = {\nrev = \"60b977cd\";\nsha256 = \"1v9v5z5i3cs9jw48m3xx9w4fqkns37nn464fr7hds7wgmwfmf1sp\";\n- patchFile = ./nix/fix-master.patch;\n+ patches = [ ./nix/fix-master.patch ] ++ patches;\ninherit protocols;\n};\nstatic-nix = import ./nix/static.nix;\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -365,7 +365,7 @@ let\nminimumOCamlVersion = \"4.07\";\n- patches = [ branchInfo.patchFile ];\n+ patches = branchInfo.patches;\nsrc = fetchgit {\nurl = \"https://gitlab.com/tezos/tezos.git/\";\nrev = branchInfo.rev;\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Make tezos patches configurable
Problem: In one of our projects we want to provide batched static
tezos-binaries.
Solution: Make patches configurable.
|
603,652
|
25.02.2020 11:10:08
| -10,800
|
5ed8c7066e9f8923e32aaaa164d0111d771c14ed
|
Exclude deb and rpm packages from releases
Problem: Each release contains packages-deb.tar.gz and
packages-rpm.tar.gz which occupy more than 150 MB in total and are not
really useful because they are accessible from ppa and copr.
Solution: Exclude them from releases.
|
[
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\" }:\n-let closures = builtins.attrValues (import ./. { inherit pkgs timestamp; });\n+let\n+ ignored_closures = [ \"deb-packages\" \"rpm-packages\" ];\n+ closures = builtins.attrValues\n+ (pkgs.lib.filterAttrs (n: v: !(builtins.elem n ignored_closures))\n+ (import ./. { inherit pkgs timestamp; }));\nin pkgs.runCommandNoCC \"release\" { inherit closures; } ''\nmkdir -p $out\nfor closure in $closures; do\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -14,10 +14,7 @@ assets_dir=$TEMPDIR/assets\n# Build release.nix\nnix-build release.nix -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\"\nmkdir -p \"$assets_dir\"\n-# Create archives with deb and rpm packages\n-tar -cvzf \"$assets_dir\"/packages-deb.tar.gz --mode='u+rwX' -C \"$TEMPDIR\"/\"$project\" $(cd \"$TEMPDIR\"/\"$project\" && ls *.deb)\n-tar -cvzf \"$assets_dir\"/packages-rpm.tar.gz --mode='u+rwX' -C \"$TEMPDIR\"/\"$project\" $(cd \"$TEMPDIR\"/\"$project\" && ls *.rpm)\n-# Move these archives to assets\n+# Move archive with binaries and tezos license to assets\ncp \"$TEMPDIR\"/\"$project\"/*.tar.gz \"$assets_dir\"\ncp \"$TEMPDIR\"/\"$project\"/LICENSE \"$assets_dir\"\n# Unpack binaries\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#34] Exclude deb and rpm packages from releases
Problem: Each release contains packages-deb.tar.gz and
packages-rpm.tar.gz which occupy more than 150 MB in total and are not
really useful because they are accessible from ppa and copr.
Solution: Exclude them from releases.
|
603,652
|
20.12.2019 17:17:43
| -10,800
|
bf796c545a18bd40ccb417da0c2d3e01088d5e06
|
Update README
Problem: It is possible to generate source packages now.
Solution: Explain how to build them an use in order to publish on
Launchpad or Copr.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -119,6 +119,26 @@ To build `.deb` packages with tezos binaries.\nOnce you built them, you can install `.deb` packages using the following command:\n```\nsudo apt install <path to deb file>\n+\n+### Publish packages on Launchpad PPA\n+\n+In order to publish packages on PPA you will have to build source packages,\n+you can do this by running the following commands:\n+```\n+nix-build -A deb-source-packages -o deb-source-packages \\\n+--arg builderInfo \"\\\"Roman Melnikov <roman.melnikov@serokell.io>\\\"\" \\\n+--arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" --arg date \"\\\"$(date -R)\\\"\"\n+# Note that buildInfo should contain information about user how is capable\n+# in publishing packages on PPA\n+\n+# Copy files from /nix/store\n+mkdir -p source-packages\n+cp deb-source-packages/* source-packages\n+# Sign *.changes files with your gpg key, which should be known\n+# for Launchpad\n+debsign source-packages/*.changes\n+# dput all packages to PPA repository\n+dput ppa:serokell/tezos source-package/*.changes\n```\n### Fedora `.rpm` packages\n@@ -140,6 +160,20 @@ Once you built them, you can install `.rpm` packages using the following command\nsudo yum localinstall <path to the rpm file>\n```\n+### Publish packages on Fedora Copr\n+\n+In order to publish packages on Copr you will have to build source packages,\n+you can do this by running the following command:\n+```\n+nix-build -A rpm-source-packages -o rpm-source-packages \\\n+--arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\"\n+# Copy files from /nix/store\n+mkdir -p source-packages\n+cp rpm-source-packages/* source-packages\n+```\n+After this `source-packages` directory will contain `.src.rpm` packages which\n+can be uploaded to Copr repository.\n+\n## For Contributors\nPlease see [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#19] Update README
Problem: It is possible to generate source packages now.
Solution: Explain how to build them an use in order to publish on
Launchpad or Copr.
|
603,652
|
24.01.2020 13:39:52
| -10,800
|
4c9dd2006a82a2fd79b66646135e569218976ef0
|
Filter attributes for release
Problem: We don't really want to include source packages in the
releases. However, current `release.nix` takes all `default.nix`
attributes.
Solution: Filter attributes to drop source packages.
|
[
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "# SPDX-License-Identifier: MPL-2.0\n{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\" }:\nlet\n- ignored_closures = [ \"deb-packages\" \"rpm-packages\" ];\n+ ignored_closures = [\n+ \"deb-packages\"\n+ \"rpm-packages\"\n+ \"deb-source-packages\"\n+ \"rpm-source-packages\"\n+ ];\nclosures = builtins.attrValues\n(pkgs.lib.filterAttrs (n: v: !(builtins.elem n ignored_closures))\n(import ./. { inherit pkgs timestamp; }));\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#19] Filter attributes for release
Problem: We don't really want to include source packages in the
releases. However, current `release.nix` takes all `default.nix`
attributes.
Solution: Filter attributes to drop source packages.
|
603,652
|
12.02.2020 16:25:03
| -10,800
|
1bb436f27e527b7fb5a552efb7f5ea06ac733979
|
Configurable ubuntu version
Problem: Previously, we were building packages only for xenial and
later copy them to bionic via launchpad.
Solution: Make ubuntu version configurable, set "bionic" (18.04 LTS) as
default version to build source packages for.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -127,9 +127,13 @@ you can do this by running the following commands:\n```\nnix-build -A deb-source-packages -o deb-source-packages \\\n--arg builderInfo \"\\\"Roman Melnikov <roman.melnikov@serokell.io>\\\"\" \\\n---arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" --arg date \"\\\"$(date -R)\\\"\"\n+--arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" --arg date \"\\\"$(date -R)\\\"\" \\\n+--arg ubuntuVersion \"\\\"bionic\\\"\"\n# Note that buildInfo should contain information about user how is capable\n# in publishing packages on PPA\n+# Also you can specify ubuntu version you're building packages for.\n+# \"bionic\" (18.04 LTS) is default version. Consider building packages\n+# for \"eoan\" and \"xenial\" as well.\n# Copy files from /nix/store\nmkdir -p source-packages\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\n-{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\"\n-, date ? \"Thu, 1 Jan 1970 10:00:00 +0300\", builderInfo ? \"\", patches ? [] }:\n+{ pkgs ? import <nixpkgs> { }, timestamp ? \"19700101\", patches ? []\n+, date ? \"Thu, 1 Jan 1970 10:00:00 +0300\", builderInfo ? \"\"\n+, ubuntuVersion ? \"bionic\"}:\nwith pkgs;\nlet\n@@ -115,7 +116,7 @@ let\nimport ./packageSourceDeb.nix {\ninherit stdenv writeTextFile writeScript runCommand;\ninherit (lib) toLower;\n- } packageDesc { inherit date builderInfo; };\n+ } packageDesc { inherit date builderInfo ubuntuVersion; };\nbuildSourceRpm = packageDesc:\nimport ./packageRpm.nix {\ninherit stdenv writeTextFile gnutar rpm buildFHSUserEnv;\n@@ -142,11 +143,9 @@ let\nbuildSourceDebInVM = pkgDesc:\nrunInLinuxImage ((buildSourceDeb pkgDesc) // { diskImage = ubuntuImage; });\n- deb-source-packages =\n- moveDerivations (map buildSourceDebInVM packageDescs);\n+ deb-source-packages = moveDerivations (map buildSourceDebInVM packageDescs);\n- rpm-source-packages =\n- moveDerivations (map buildSourceRpm packageDescs);\n+ rpm-source-packages = moveDerivations (map buildSourceRpm packageDescs);\nreleaseFile = writeTextFile {\nname = \"release-notes.md\";\n"
},
{
"change_type": "MODIFY",
"old_path": "packageSourceDeb.nix",
"new_path": "packageSourceDeb.nix",
"diff": "# SPDX-License-Identifier: MPL-2.0\n{ stdenv, writeTextFile, writeScript, runCommand, toLower }:\npkgDesc:\n-{ date, builderInfo }:\n+{ date, builderInfo, ubuntuVersion }:\nlet\nproject = toLower pkgDesc.project;\n@@ -37,7 +37,7 @@ let\nwriteChangelogFile = writeTextFile {\nname = \"changelog\";\ntext = ''\n- ${project} (0ubuntu${version}-${revision}) xenial; urgency=medium\n+ ${project} (0ubuntu${version}-${revision}) ${ubuntuVersion}; urgency=medium\n* Publish ${revision} revision of ${project}.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#19] Configurable ubuntu version
Problem: Previously, we were building packages only for xenial and
later copy them to bionic via launchpad.
Solution: Make ubuntu version configurable, set "bionic" (18.04 LTS) as
default version to build source packages for.
|
603,652
|
02.03.2020 18:14:11
| -10,800
|
262413647ca8a1555df95eb962289e13b09e066e
|
Hotfix README
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -119,6 +119,7 @@ To build `.deb` packages with tezos binaries.\nOnce you built them, you can install `.deb` packages using the following command:\n```\nsudo apt install <path to deb file>\n+```\n### Publish packages on Launchpad PPA\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#19] Hotfix README
|
603,652
|
03.03.2020 19:05:21
| -10,800
|
dd27199aeebed1c4e9326619e76c561ab84aabb7
|
Fix carthagenet specific binaries
Problem: Dune files for `tezos-{accuser, baker, endorser}-006-PsCARTHA`
were lacking flags required for static building. This caused errors
when trying to run built executables.
Solution: Add flags.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/fix-master.patch",
"new_path": "nix/fix-master.patch",
"diff": "@@ -78,6 +78,51 @@ index d1b60c7..a738ef2 100644\n+ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\"\n+ )))\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_006_PsCARTHA/bin_accuser/dune b/src/proto_006_PsCARTHA/bin_accuser/dune\n+index e99ac8f..5afd74b 100644\n+--- a/src/proto_006_PsCARTHA/bin_accuser/dune\n++++ b/src/proto_006_PsCARTHA/bin_accuser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_006_PsCARTHA_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_006_PsCARTHA/bin_baker/dune b/src/proto_006_PsCARTHA/bin_baker/dune\n+index d96ef4c..baa8598 100644\n+--- a/src/proto_006_PsCARTHA/bin_baker/dune\n++++ b/src/proto_006_PsCARTHA/bin_baker/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_006_PsCARTHA_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n+ (alias\n+ (name runtest_lint)\n+diff --git a/src/proto_006_PsCARTHA/bin_endorser/dune b/src/proto_006_PsCARTHA/bin_endorser/dune\n+index c675ab3..ac0f52b 100644\n+--- a/src/proto_006_PsCARTHA/bin_endorser/dune\n++++ b/src/proto_006_PsCARTHA/bin_endorser/dune\n+@@ -10,7 +10,9 @@\n+ -open Tezos_client_commands\n+ -open Tezos_baking_006_PsCARTHA_commands\n+ -open Tezos_stdlib_unix\n+- -open Tezos_client_base_unix)))\n++ -open Tezos_client_base_unix\n++ -ccopt -static\n++ -cclib \"-lusb-1.0 -lhidapi-libusb -ludev\")))\n+\n(alias\n(name runtest_lint)\ndiff --git a/src/bin_signer/dune b/src/bin_signer/dune\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#38] Fix carthagenet specific binaries
Problem: Dune files for `tezos-{accuser, baker, endorser}-006-PsCARTHA`
were lacking flags required for static building. This caused errors
when trying to run built executables.
Solution: Add flags.
|
603,652
|
04.03.2020 17:07:11
| -10,800
|
f8304b514fc7913133325649e4a7d9d7b373e049
|
Test static binaries in CI
Problem: It would be nice to somehow test that our binaries work.
Solution: Run them with `--help` and ensure they return 0 exit code.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -23,7 +23,11 @@ steps:\n- ./binaries/*\n- ./deb-packages/*\n- ./rpm-packages/*\n- branches: !master\n+ branches: \"!master\"\n+ - commands:\n+ - nix-build -A test-binaries --no-out-link\n+ label: test binaries\n+ branches: \"!master\"\n- commands:\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nlabel: create auto pre-release\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -164,7 +164,15 @@ let\ncp ${releaseFile} $out/\n'';\n+ test-binaries = runCommand \"test-binaries\" { inherit tezos-static-master; } ''\n+ for f in ${tezos-static-master}/bin/*; do\n+ echo \"$f\"\n+ \"$f\" --help &> /dev/null\n+ done\n+ mkdir -p $out\n+ '';\n+\nin rec {\ninherit deb-packages deb-source-packages rpm-source-packages rpm-packages\n- binaries tezos-license releaseNotes;\n+ binaries tezos-license releaseNotes test-binaries;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "@@ -8,6 +8,7 @@ let\n\"rpm-packages\"\n\"deb-source-packages\"\n\"rpm-source-packages\"\n+ \"test-binaries\"\n];\nclosures = builtins.attrValues\n(pkgs.lib.filterAttrs (n: v: !(builtins.elem n ignored_closures))\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#38] Test static binaries in CI
Problem: It would be nice to somehow test that our binaries work.
Solution: Run them with `--help` and ensure they return 0 exit code.
|
603,664
|
09.03.2020 09:50:52
| -10,800
|
80242f82a75c813afe81226c2f100d024c99ba29
|
autorelease.sh: add `set -euo pipefail`, clean up on failure
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n+set -euo pipefail\n+\n# Project name, inferred from repository name\nproject=$(basename \"$(pwd)\")\n# The directory in which artifacts will be created\nTEMPDIR=$(mktemp -d)\n+function finish {\n+ rm -rf \"$TEMPDIR\"\n+}\n+trap finish EXIT\n+\nassets_dir=$TEMPDIR/assets\n# Build release.nix\n@@ -20,8 +27,8 @@ cp \"$TEMPDIR\"/\"$project\"/LICENSE \"$assets_dir\"\n# Unpack binaries\ntar -C \"$assets_dir\" -xvzf \"$TEMPDIR\"/\"$project\"/binaries-*.tar.gz\n-# Delete release\n-hub release delete auto-release\n+# Delete release if it exists\n+hub release delete auto-release || true\n# Update the tag\ngit fetch # So that the script can be run from an arbitrary checkout\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
autorelease.sh: add `set -euo pipefail`, clean up on failure
|
603,652
|
24.03.2020 11:19:47
| -10,800
|
baecb72980d2a9bf9adca51cda73410d988fc812
|
Bump master branch revision.
Problem: was
merged, changes from this MR is required for some other projects and
it's convenient to use static binaries from this repo in it.
Also, OCaml compiler version for tezos was updated to 4.09.
Solution: Update compiler version, bump various libraries.
Bump master branch revision.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -18,8 +18,8 @@ let\n};\nprotocols = [ protocol005 protocol006 ];\nmaster = {\n- rev = \"60b977cd\";\n- sha256 = \"1v9v5z5i3cs9jw48m3xx9w4fqkns37nn464fr7hds7wgmwfmf1sp\";\n+ rev = \"0737ae7a\";\n+ sha256 = \"0hp4dh5xazgs894bx1v77vc1zfcgwg3ls3mqy3ylvrnbhhqx0m3x\";\npatches = [ ./nix/fix-master.patch ] ++ patches;\ninherit protocols;\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "branchInfo:\nlet\n- oca = pkgs.ocaml-ng.ocamlPackages_4_07.overrideScope' (self: super: {\n+ oca = pkgs.ocaml-ng.ocamlPackages_4_09.overrideScope' (self: super: {\n+ sexplib0 = self.callPackage ({ stdenv, fetchFromGitHub, buildDunePackage }:\n+ buildDunePackage rec {\n+ pname = \"sexplib0\";\n+ version = \"0.13.0\";\n+\n+ minimumOCamlVersion = \"4.04.2\";\n+\n+ src = fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y\";\n+ };\n+\n+ buildInputs = [ ];\n+ doCheck = true;\n+ }) { };\n+ parsexp = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, sexplib0, base }:\n+ buildDunePackage rec {\n+ pname = \"parsexp\";\n+ version = \"0.13.0\";\n+\n+ minimumOCamlVersion = \"4.04.2\";\n+\n+ src = fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38\";\n+ };\n+\n+ buildInputs = [ sexplib0 base ];\n+ doCheck = true;\n+ }) { };\n+ sexplib = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, sexplib0, base, num, parsexp }:\n+ buildDunePackage rec {\n+ pname = \"sexplib\";\n+ version = \"0.13.0\";\n+\n+ minimumOCamlVersion = \"4.04.2\";\n+\n+ src = fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn\";\n+ };\n+\n+ buildInputs = [ sexplib0 base num parsexp ];\n+ doCheck = true;\n+ }) { };\n+ base = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, sexplib0 }:\n+ buildDunePackage rec {\n+ pname = \"base\";\n+ version = \"0.13.1\";\n+\n+ minimumOCamlVersion = \"4.04.2\";\n+\n+ src = fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw\";\n+ };\n+\n+ buildInputs = [ sexplib0 ];\n+ doCheck = true;\n+ }) { };\n+ stdio = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, base, sexplib0 }:\n+\n+ buildDunePackage rec {\n+ pname = \"stdio\";\n+ version = \"0.13.0\";\n+\n+ minimumOCamlVersion = \"4.04.2\";\n+\n+ src = fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh\";\n+ };\n+\n+ buildInputs = [ base sexplib0 ];\n+ doCheck = true;\n+ }) { };\nbigstring = self.callPackage\n({ stdenv, fetchFromGitHub, buildDunePackage, base }:\n@@ -59,7 +149,7 @@ let\nbuildInputs = [ ocamlbuild ];\nbuildPhase = \"make build\";\ninstallPhase = ''\n- mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ mkdir -p $out/lib/ocaml/4.09.0/site-lib\nmake install\n'';\ndoCheck = false;\n@@ -93,7 +183,7 @@ let\nminimumOCamlVersion = \"4.03\";\nbuildPhase = \"\";\ninstallPhase = ''\n- mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ mkdir -p $out/lib/ocaml/4.09.0/site-lib\nmake install\n'';\n@@ -145,7 +235,7 @@ let\nmake\n'';\ninstallPhase = ''\n- mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ mkdir -p $out/lib/ocaml/4.09.0/site-lib\nmake install-findlib\n'';\n@@ -193,7 +283,13 @@ let\nrev = \"v${version}\";\nsha256 = \"0v4lxc6g9mavx8nk7djzsvx1blw5wsjn2cg6k6a35fyv64xmwd73\";\n};\n- propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.sexplib ];\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.sexplib self.parsexp ];\n+ });\n+ cstruct-sexp = super.cstruct-sexp.overrideDerivation (o: rec {\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.parsexp self.sexplib0 self.base ];\n+ });\n+ ppx_cstruct = super.ppx_cstruct.overrideDerivation (o: rec {\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.parsexp ];\n});\nconduit-lwt-unix = super.conduit-lwt-unix.overrideDerivation (o: rec {\nversion = \"2.0.1\";\n@@ -206,16 +302,116 @@ let\npropagatedBuildInputs = [ self.conduit-lwt self.logs self.tls ];\n});\ncohttp = super.cohttp.overrideDerivation (o: rec {\n- version = \"2.3.0\";\n- name = \"cohttp-2.3.0\";\n+ version = \"2.5.1\";\n+ name = \"cohttp-2.5.1\";\nsrc = pkgs.fetchFromGitHub {\nowner = \"mirage\";\nrepo = \"ocaml-${o.pname}\";\nrev = \"v${version}\";\n- sha256 = \"0fag9zhv1lhbq1p4p1cmbav009x2d79kq3iv04pisj5y071qhhvr\";\n+ sha256 = \"1rjdsc2d3y65rlqpjq3xqjjr1wxzqqbyjdg5z29vajncvyrpzk1z\";\n};\npropagatedBuildInputs = o.propagatedBuildInputs ++ [ self.stdlib-shims ];\n});\n+ ocaml-compilers-libs = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage }:\n+ buildDunePackage rec {\n+ pname = \"ocaml-compilers-libs\";\n+ version = \"0.12.1\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0jkhwmkrfq3ss5bv6i3m861alcr4ypngs6ci6bmzv3yfl7s8bwdf\";\n+ };\n+ propagatedBuildInputs = [ ];\n+ }) { };\n+ ppx_derivers = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, base, sexplib0, stdio }:\n+ buildDunePackage rec {\n+ pname = \"ppx_derivers\";\n+ version = \"1.2.1\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"ocaml-ppx\";\n+ repo = \"${pname}\";\n+ rev = \"${version}\";\n+ sha256 = \"0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn\";\n+ };\n+ propagatedBuildInputs = [ base sexplib0 stdio ];\n+ }) { };\n+ ppxlib = self.callPackage ({ stdenv, fetchFromGitHub, buildDunePackage, base\n+ , sexplib0, stdio, ppx_derivers, ocaml-compiler-libs\n+ , ocaml-migrate-parsetree }:\n+ buildDunePackage rec {\n+ pname = \"ppxlib\";\n+ minimumOCamlVersion = \"4.04\";\n+ version = \"0.12.0\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"ocaml-ppx\";\n+ repo = \"${pname}\";\n+ rev = \"${version}\";\n+ sha256 = \"1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1\";\n+ };\n+ propagatedBuildInputs = [\n+ base\n+ sexplib0\n+ stdio\n+ ppx_derivers\n+ ocaml-compiler-libs\n+ ocaml-migrate-parsetree\n+ ];\n+ }) { };\n+ ppx_sexp_conv = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, base, sexplib0, ppxlib }:\n+ buildDunePackage rec {\n+ pname = \"ppx_sexp_conv\";\n+ minimumOCamlVersion = \"4.04\";\n+ version = \"0.13.0\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf\";\n+ };\n+ propagatedBuildInputs = [ base sexplib0 ppxlib ];\n+ }) { };\n+ cohttp-lwt = super.cohttp-lwt.overrideDerivation (o: rec {\n+ version = \"2.5.1\";\n+ name = \"cohttp-lwt\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"mirage\";\n+ repo = \"ocaml-cohttp\";\n+ rev = \"v${version}\";\n+ sha256 = \"1rjdsc2d3y65rlqpjq3xqjjr1wxzqqbyjdg5z29vajncvyrpzk1z\";\n+ };\n+ propagatedBuildInputs = o.propagatedBuildInputs\n+ ++ [ self.stdlib-shims self.sexplib0 self.ppx_sexp_conv ];\n+ });\n+ fieldslib = self.callPackage\n+ ({ stdenv, fetchFromGitHub, buildDunePackage, base, sexplib0 }:\n+ buildDunePackage rec {\n+ pname = \"fieldslib\";\n+ version = \"0.13.0\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa\";\n+ };\n+ propagatedBuildInputs = [ base sexplib0 ];\n+ }) { };\n+ ppx_fields_conv = self.callPackage ({ stdenv, fetchFromGitHub\n+ , buildDunePackage, base, sexplib0, ppxlib, fieldslib }:\n+ buildDunePackage rec {\n+ pname = \"ppx_fields_conv\";\n+ version = \"0.13.0\";\n+ src = pkgs.fetchFromGitHub {\n+ owner = \"janestreet\";\n+ repo = \"${pname}\";\n+ rev = \"v${version}\";\n+ sha256 = \"0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4\";\n+ };\n+ propagatedBuildInputs = [ base sexplib0 ppxlib fieldslib ];\n+ }) { };\ndomain-name = self.callPackage\n({ stdenv, fetchFromGitHub, buildDunePackage, fmt, astring }:\nbuildDunePackage rec {\n@@ -245,7 +441,7 @@ let\nbuildInputs = [ ocamlbuild ];\nbuildPhase = \"\";\ninstallPhase = ''\n- mkdir -p $out/lib/ocaml/4.07.1/site-lib\n+ mkdir -p $out/lib/ocaml/4.09.0/site-lib\nmake install\n'';\ndoCheck = false;\n@@ -266,8 +462,8 @@ let\nbuildInputs = [ pprint astring base ];\nbuildPhase = \"\";\ninstallPhase = ''\n- mkdir -p $out/lib/ocaml/4.07.1/site-lib\n- mkdir -p $out/lib/ocaml/4.07.1/bin\n+ mkdir -p $out/lib/ocaml/4.09.0/site-lib\n+ mkdir -p $out/lib/ocaml/4.09.0/bin\nmake install\n'';\ndoCheck = false;\n@@ -281,6 +477,10 @@ let\nrev = \"v${version}\";\nsha256 = \"064j9pzy01p3dv947khqyn7fkjbs3jmrqsg8limb4abnlaqxxs2s\";\n};\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.parsexp self.sexplib0 self.base ];\n+ });\n+ nocrypto = super.nocrypto.overrideDerivation (o: rec {\n+ propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.parsexp ];\n});\nfmt = super.fmt.overrideDerivation (o: rec {\nversion = \"0.8.8\";\n@@ -352,13 +552,187 @@ let\ndoCheck = false;\n}) { };\n+ data-encoding = self.callPackage ({ buildDunePackage, json-data-encoding\n+ , json-data-encoding-bson, ezjsonm, zarith, uri, ocplib-endian }:\n+ buildDunePackage rec {\n+ pname = \"data-encoding\";\n+ version = \"0.2\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/data-encoding/-/archive/0.2/data-encoding-0.2.tar.gz\";\n+ sha256 = \"0d9c2ix2imqk4r0jfhnwak9laarlbsq9kmswvbnjzdm2g0hwin1d\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ ezjsonm\n+ zarith\n+ uri\n+ ocplib-endian\n+ ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto = self.callPackage ({ buildDunePackage, json-data-encoding\n+ , json-data-encoding-bson, uri, ocplib-endian, lwt4 }:\n+ buildDunePackage rec {\n+ pname = \"resto\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs =\n+ [ json-data-encoding json-data-encoding-bson uri ocplib-endian lwt4 ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto-json = self.callPackage ({ buildDunePackage, json-data-encoding\n+ , json-data-encoding-bson, uri, ocplib-endian, lwt4, resto }:\n+ buildDunePackage rec {\n+ pname = \"resto-json\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ uri\n+ ocplib-endian\n+ lwt4\n+ resto\n+ ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto-directory = self.callPackage ({ buildDunePackage, json-data-encoding\n+ , json-data-encoding-bson, uri, ocplib-endian, lwt4, resto, resto-json }:\n+ buildDunePackage rec {\n+ pname = \"resto-directory\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ uri\n+ ocplib-endian\n+ lwt4\n+ resto\n+ resto-json\n+ ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto-cohttp = self.callPackage ({ buildDunePackage, json-data-encoding\n+ , json-data-encoding-bson, uri, ocplib-endian, lwt4, resto, resto-json\n+ , resto-directory, cohttp-lwt }:\n+ buildDunePackage rec {\n+ pname = \"resto-cohttp\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ uri\n+ ocplib-endian\n+ lwt4\n+ resto\n+ resto-json\n+ resto-directory\n+ cohttp-lwt\n+ ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto-cohttp-client = self.callPackage ({ buildDunePackage\n+ , json-data-encoding, json-data-encoding-bson, uri, ocplib-endian, lwt4\n+ , resto, resto-json, resto-directory, cohttp-lwt, resto-cohttp }:\n+ buildDunePackage rec {\n+ pname = \"resto-cohttp-client\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ uri\n+ ocplib-endian\n+ lwt4\n+ resto\n+ resto-json\n+ resto-directory\n+ cohttp-lwt\n+ resto-cohttp\n+ ];\n+ doCheck = false;\n+ }) { };\n+\n+ resto-cohttp-server = self.callPackage ({ buildDunePackage\n+ , json-data-encoding, json-data-encoding-bson, uri, ocplib-endian, lwt4\n+ , resto, resto-json, resto-directory, cohttp-lwt, resto-cohttp\n+ , cohttp-lwt-unix }:\n+ buildDunePackage rec {\n+ pname = \"resto-cohttp-server\";\n+ version = \"0.4\";\n+\n+ minimumOCamlVersion = \"4.03\";\n+ src = builtins.fetchTarball {\n+ url =\n+ \"https://gitlab.com/nomadic-labs/resto/-/archive/v0.4/resto-v0.4.tar.gz\";\n+ sha256 = \"0v0cyf8na21fnvy3abhhnnw8msh16dqcrp61pzaxj839rm62h3vy\";\n+ };\n+ buildInputs = [\n+ json-data-encoding\n+ json-data-encoding-bson\n+ uri\n+ ocplib-endian\n+ lwt4\n+ resto\n+ resto-json\n+ resto-directory\n+ cohttp-lwt\n+ resto-cohttp\n+ cohttp-lwt-unix\n+ ];\n+ doCheck = false;\n+ }) { };\n+\ntezos = self.callPackage ({ stdenv, fetchgit, buildDunePackage, base\n, bigstring, cohttp-lwt, cohttp-lwt-unix, cstruct, ezjsonm, hex, ipaddr\n, js_of_ocaml, cmdliner, easy-format, tls, lwt4, lwt_log, mtime\n, ocplib-endian, ptime, re, rresult, stdio, uri, uutf, zarith, libusb1\n, hidapi, gmp, irmin, alcotest, dum, genspio, ocamlgraph, findlib\n, digestif, ocp-ocamlres, pprint, upx, json-data-encoding\n- , json-data-encoding-bson, lwt-canceler, lwt-watcher }:\n+ , json-data-encoding-bson, lwt-canceler, lwt-watcher, data-encoding, resto\n+ , resto-directory, resto-cohttp, resto-cohttp-client, resto-cohttp-server\n+ }:\nbuildDunePackage rec {\npname = \"tezos\";\nversion = \"0.0.1\";\n@@ -412,12 +786,18 @@ let\njson-data-encoding-bson\nlwt-canceler\nlwt-watcher\n+ data-encoding\n+ resto\n+ resto-directory\n+ resto-cohttp\n+ resto-cohttp-client\n+ resto-cohttp-server\n] ++ [ libusb1 libusb1.out (gmp.override { withStatic = true; }) upx ];\ndoCheck = false;\nprotocolsNames = map (x: x.protocolName) branchInfo.protocols;\nbuildPhase = ''\n# tezos-node build requires ocp-ocamlres binary in PATH\n- PATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.07.1/bin\n+ PATH=$PATH:${ocp-ocamlres}/lib/ocaml/4.09.0/bin\ninstall_files=()\nfor protocol_name in $protocolsNames; do\nprotocol_suffix=$(echo \"$protocol_name\" | tr \"_\" \"-\")\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/fix-master.patch",
"new_path": "nix/fix-master.patch",
"diff": "@@ -142,7 +142,7 @@ index e4c9a7c..2a5f941 100644\n(alias\n(name runtest_lint)\ndiff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune\n-index 1142419..d8086b4 100644\n+index 0902181..30fe55b 100644\n--- a/src/lib_protocol_compiler/dune\n+++ b/src/lib_protocol_compiler/dune\n@@ -155,12 +155,12 @@ index 1142419..d8086b4 100644\n(executable\ndiff --git a/vendors/index/src/unix/dune b/vendors/index/src/unix/dune\n-index 2981490..655fa7f 100644\n+index 49e819d..833a3f4 100644\n--- a/vendors/index/src/unix/dune\n+++ b/vendors/index/src/unix/dune\n(public_name index.unix)\n(name index_unix)\n- (c_names pread pwrite)\n-- (libraries index logs logs.threaded threads unix))\n-+ (libraries index logs threads unix))\n+ (c_names fsync pread pwrite)\n+- (libraries fmt index logs logs.threaded threads.posix unix))\n++ (libraries fmt index logs threads.posix unix))\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/static.nix",
"new_path": "nix/static.nix",
"diff": "@@ -9,7 +9,7 @@ let\n})).overrideDerivation (o:\nif o.stdenv.hostPlatform != o.stdenv.buildPlatform then {\npreConfigure = ''\n- configureFlagsArray+=(\"-cc\" \"$CC\" \"-as\" \"$AS\" \"-partialld\" \"$LD -r\")\n+ configureFlagsArray+=(\"CC=$CC\" \"AS=$AS\" \"PARTIALLD=$LD -r\")\n'';\nconfigureFlags = o.configureFlags ++ [\n\"-host ${o.stdenv.hostPlatform.config} -target ${o.stdenv.targetPlatform.config}\"\n@@ -23,7 +23,7 @@ let\n});\ndds = x: x.overrideAttrs (o: { dontDisableStatic = true; });\nnixpkgs-fixed = builtins.fetchTarball\n- \"https://github.com/serokell/nixpkgs/archive/ocaml-cross-fixes.tar.gz\";\n+ \"https://github.com/serokell/nixpkgs/archive/ocaml-cross-fixes-new.tar.gz\";\npkgsNative = import nixpkgs-fixed { };\npkgs = import nixpkgs-fixed {\ncrossSystem = pkgsNative.lib.systems.examples.musl64;\n@@ -34,17 +34,17 @@ let\ngetent = self.musl-bin;\ngetconf = self.musl-bin;\nlibev = dds super.libev;\n- libusb1 = dds (super.libusb1.override { systemd = self.eudev; });\n+ libusb1 = dds (super.libusb1.override { systemd = self.eudev; enableSystemd = true; });\nhidapi = dds (super.hidapi.override { systemd = self.eudev; });\nglib = (super.glib.override { libselinux = null; }).overrideAttrs\n(o: { mesonFlags = o.mesonFlags ++ [ \"-Dselinux=disabled\" ]; });\neudev = dds (super.eudev.overrideAttrs\n(o: { nativeBuildInputs = o.nativeBuildInputs ++ [ super.gperf ]; }));\nopaline = fixOcamlBuild (super.opaline.override {\n- ocamlPackages = self.ocaml-ng.ocamlPackages_4_07;\n+ ocamlPackages = self.ocaml-ng.ocamlPackages_4_09;\n});\nocaml-ng = super.ocaml-ng // {\n- ocamlPackages_4_07 = super.ocaml-ng.ocamlPackages_4_07.overrideScope'\n+ ocamlPackages_4_09 = super.ocaml-ng.ocamlPackages_4_09.overrideScope'\n(oself: osuper: {\nocaml = fixOcaml osuper.ocaml;\nfindlib = fixOcamlBuild osuper.findlib;\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Bump master branch revision.
Problem: https://gitlab.com/tezos/tezos/-/merge_requests/1624 was
merged, changes from this MR is required for some other projects and
it's convenient to use static binaries from this repo in it.
Also, OCaml compiler version for tezos was updated to 4.09.
Solution: Update compiler version, bump various libraries.
Bump master branch revision.
|
603,652
|
06.05.2020 12:59:51
| -10,800
|
b4a7d8f7de8aaf14f39ad94da998bf96aa664569
|
Unignore base protocols
Problem: When starting from scratch `tezos-node` required information
about base chain protocols. Currently, we ignore all protocols except
006, hthis cause `tezos-node run` to fail.
Solution: Unignore `genesis`, `genesis-carthagenet`, `000-Ps9mPmXa`.
|
[
{
"change_type": "MODIFY",
"old_path": "protocols.json",
"new_path": "protocols.json",
"diff": "{\n\"ignored\": [\n\"alpha\",\n- \"genesis\",\n- \"genesis-carthagenet\",\n\"demo-counter\",\n- \"000-Ps9mPmXa\",\n\"001-PtCJ7pwo\",\n\"002-PsYLVpVv\",\n\"003-PsddFKi3\",\n\"005-PsBABY5H\",\n\"005-PsBabyM1\"\n],\n- \"allowed\": [],\n+ \"allowed\": [\n+ \"genesis\",\n+ \"genesis-carthagenet\",\n+ \"000-Ps9mPmXa\"\n+ ],\n\"active\": [\n\"006-PsCARTHA\"\n]\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#48] Unignore base protocols
Problem: When starting from scratch `tezos-node` required information
about base chain protocols. Currently, we ignore all protocols except
006, hthis cause `tezos-node run` to fail.
Solution: Unignore `genesis`, `genesis-carthagenet`, `000-Ps9mPmXa`.
|
603,652
|
06.05.2020 15:39:33
| -10,800
|
e96dc8bce22f6cf2ec708ef9a0589b494dfae612
|
Add testing tezos-node run
Motivation: Let's check that tezos-node is capable of runnint mainnet and
carthagenet in CI.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -59,6 +59,15 @@ let\necho \"$f\"\n\"$f\" --help &> /dev/null\ndone\n+ # Test that tezos-node run works for carthagenet\n+ ${bundled.binaries}/bin/tezos-node config init --data-dir node-dir --network carthagenet\n+ ${bundled.binaries}/bin/tezos-node identity generate 1 --data-dir node-dir\n+ timeout --preserve-status 5 ${bundled.binaries}/bin/tezos-node run --data-dir node-dir --network carthagenet\n+ rm -rf node-dir\n+ # Test that tezos-node run works for mainnet\n+ ${bundled.binaries}/bin/tezos-node config init --data-dir node-dir --network mainnet\n+ ${bundled.binaries}/bin/tezos-node identity generate 1 --data-dir node-dir\n+ timeout --preserve-status 5 ${bundled.binaries}/bin/tezos-node run --data-dir node-dir --network mainnet\ntouch $out\n'';\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#48] Add testing tezos-node run
Motivation: Let's check that tezos-node is capable of runnint mainnet and
carthagenet in CI.
|
603,652
|
06.05.2020 14:04:52
| -10,800
|
81a382433bb5ea17e3eaffb8f6826a22f6371301
|
Bump tezos revision to v7.0 release.
|
[
{
"change_type": "MODIFY",
"old_path": "nix/sources.json",
"new_path": "nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"master\",\n+ \"ref\": \"v7.0\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"e93d500e20d757a25c87a415de3f0074ec663c84\",\n+ \"rev\": \"4053147fe577e9a04a5a09634a5645b2e26343e0\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#47] Bump tezos revision to v7.0 release.
|
603,652
|
06.05.2020 14:05:41
| -10,800
|
241e0910db76c3005e43779f34ea85dffffa1b55
|
Use tezos/tezos tag in the package versioning
Problem: Tezos now uses some versioning. `v7.0` recently was
released. We should use this versioning.
Solution: Use release version instead of timestamp for packages
versions. We will use releases numbers in case we need to change
something in the packaging code instead of revision hashes.
|
[
{
"change_type": "MODIFY",
"old_path": "deb.nix",
"new_path": "deb.nix",
"diff": "@@ -6,15 +6,16 @@ pkg:\nlet\nproject = pkg.meta.name;\nversion = meta.version;\n- revision = meta.gitRevision;\n+ release = meta.release;\n+ epoch = meta.epoch;\npkgArch = meta.arch;\n- pkgName = \"${project}_0ubuntu${version}-${revision}_${pkgArch}\";\n+ pkgName = \"${project}_0ubuntu${version}-${release}_${pkgArch}\";\nwriteControlFile = writeTextFile {\nname = \"control\";\ntext = ''\nPackage: ${project}\n- Version: ${version}-${revision}\n+ Version: ${epoch}:${version}-${release}\nPriority: optional\nArchitecture: ${meta.arch}\nDepends: ${meta.dependencies}\n"
},
{
"change_type": "MODIFY",
"old_path": "debSource.nix",
"new_path": "debSource.nix",
"diff": "@@ -7,9 +7,9 @@ pkg:\nlet\nproject = lib.toLower pkg.meta.name;\nversion = meta.version;\n- revision = meta.gitRevision;\n+ release = meta.release;\n+ epoch = meta.epoch;\npkgArch = meta.arch;\n- pkgName = \"${project}_0ubuntu${version}-${revision}_${pkgArch}\";\ninherit (vmTools)\nmakeImageFromDebDist commonDebPackages debDistros runInLinuxImage;\nubuntuImage = makeImageFromDebDist (debDistros.ubuntu1804x86_64 // {\n@@ -41,9 +41,9 @@ let\nwriteChangelogFile = writeTextFile {\nname = \"changelog\";\ntext = ''\n- ${project} (0ubuntu${version}-${revision}) ${meta.ubuntuVersion}; urgency=medium\n+ ${project} (${epoch}:0ubuntu${version}-${release}) ${meta.ubuntuVersion}; urgency=medium\n- * Publish ${revision} revision of ${project}.\n+ * Publish ${version}-${release} version of ${project}.\n-- ${meta.builderInfo} ${meta.date}\n'';\n@@ -81,7 +81,7 @@ let\necho \"The Debian Package for ${project}\" > debian/README\necho \"3.0 (native)\" > debian/source/format\ncp ${writeRulesFile} debian/rules\n- dpkg-buildpackage -S -us -uc | tee ../${project}_0ubuntu${version}-${revision}_source.buildinfo 2>&1\n+ dpkg-buildpackage -S -us -uc | tee ../${project}_${epoch}:0ubuntu${version}-${release}_source.buildinfo 2>&1\nmkdir -p $out\ncp ../*.* $out/\n'';\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -14,12 +14,16 @@ let\ninherit (meta) name;\nvalue = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n}) release-binaries);\n+\ncommonMeta = {\n- gitRevision = source.rev;\n- version = toString timestamp;\n+ # release should be updated in case we change something\n+ release = \"1\";\n+ # we switched from time-based versioning to proper tezos versioning\n+ epoch = \"1\";\n+ version = builtins.replaceStrings [\"v\"] [\"\"] source.ref;\nlicense = \"MPL-2.0\";\ndependencies = \"\";\n- maintainer = \"Serokell https://serokell.io\";\n+ maintainer = \"Serokell https://serokell.io <hi@serokell.io>\";\nbranchName = source.ref;\nlicenseFile = \"${source}/LICENSE\";\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "@@ -9,7 +9,7 @@ let\nrelease-notes = writeTextDir \"release-notes.md\" ''\nAutomatic release on ${builtins.substring 0 8 timestamp}\n- This release contains assets based on [revision ${source.rev}](https://gitlab.com/tezos/tezos/tree/${source.rev}) of ${source.ref} branch.\n+ This release contains assets based on [${source.ref} release](https://gitlab.com/tezos/tezos/tree/${source.ref}).\nBinaries without protocol suffixes support the following protocols (unsupported protocols are listed for reference):\n${builtins.concatStringsSep \"\\n\" (map (x: \"- [ ] `${x}`\") protocols.ignored\n@@ -24,10 +24,11 @@ let\nname = \"tezos-release-no-tarball\";\npaths = [ \"${bundled.binaries}/bin\" LICENSE release-notes ];\n};\n- releaseTarball = runCommand \"release-tarball\" { }\n- \"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/release.tar.gz -C ${releaseNoTarball} .\";\n+ tarballName = \"binaries-${builtins.replaceStrings [\"v\"] [\"\"] source.ref}-1.tar.gz\";\n+ binariesTarball = runCommand \"binaries-tarball\" { }\n+ \"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${tarballName} -C ${bundled.binaries}/bin .\";\nLICENSE = writeTextDir \"LICENSE\" (builtins.readFile \"${source}/LICENSE\");\nin buildEnv {\nname = \"tezos-release\";\n- paths = [ releaseNoTarball releaseTarball ];\n+ paths = [ releaseNoTarball binariesTarball ];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "rpm.nix",
"new_path": "rpm.nix",
"diff": "@@ -8,9 +8,9 @@ pkg:\nlet\nproject = pkg.meta.name;\nversion = meta.version;\n- revision = meta.gitRevision;\n+ release = meta.release;\narch = meta.arch;\n- pkgName = \"${project}-${version}-${revision}.${arch}\";\n+ pkgName = \"${project}-${version}-${release}.${arch}\";\nlicenseFile = meta.licenseFile;\nrpmbuild-env = buildFHSUserEnv {\n@@ -26,7 +26,8 @@ let\n# %define _unpackaged_files_terminate_build 0\nName: ${project}\nVersion: ${version}\n- Release: ${revision}\n+ Release: ${release}\n+ Epoch: ${meta.epoch}\nSummary: ${pkg.meta.description}\nLicense: ${meta.license}\nBuildArch: ${arch}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#47] Use tezos/tezos tag in the package versioning
Problem: Tezos now uses some versioning. `v7.0` recently was
released. We should use this versioning.
Solution: Use release version instead of timestamp for packages
versions. We will use releases numbers in case we need to change
something in the packaging code instead of revision hashes.
|
603,652
|
21.05.2020 14:56:38
| -10,800
|
268ffc8fba9cf32e685660935db5d84d16afe974
|
Fix debian source package generation
It was accidentally broken previosly, which causes problem during
package publishing.
|
[
{
"change_type": "MODIFY",
"old_path": "debSource.nix",
"new_path": "debSource.nix",
"diff": "@@ -43,7 +43,7 @@ let\ntext = ''\n${project} (${epoch}:0ubuntu${version}-${release}) ${meta.ubuntuVersion}; urgency=medium\n- * Publish ${version}-${release} version of ${project}.\n+ * Publish ${version}-${release} version of ${pkg.meta.name}.\n-- ${meta.builderInfo} ${meta.date}\n'';\n@@ -58,7 +58,7 @@ let\ninstall:\nmkdir -p $(DESTDIR)$(BINDIR)\n- cp ${project} $(DESTDIR)$(BINDIR)\n+ cp ${pkg.meta.name} $(DESTDIR)$(BINDIR)\n'';\n};\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Fix debian source package generation
It was accidentally broken previosly, which causes problem during
package publishing.
|
603,652
|
21.05.2020 15:00:33
| -10,800
|
cc900a26c80dfcea3fddbb620bf9283d711f4da7
|
Bump tezos sources to v7.1
|
[
{
"change_type": "MODIFY",
"old_path": "nix/sources.json",
"new_path": "nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"v7.0\",\n+ \"ref\": \"v7.1\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"4053147fe577e9a04a5a09634a5645b2e26343e0\",\n+ \"rev\": \"51977265590ba5fbd166b921e265fa22bf9f66a6\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Bump tezos sources to v7.1
|
603,652
|
26.05.2020 17:41:32
| -10,800
|
875fc3c17584258df6d5b805ed0b01c09ff19c74
|
Update README
Problem: Now it's possible to build static binaries without nix.
Solution: Mention this in README.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -74,6 +74,8 @@ If you find it more convinient to use `make`, there are some targets provided fo\n### Statically built binaries\n+#### Using nix\n+\nRun the following command:\n```bash\nnix build -f. binaries\n@@ -86,6 +88,18 @@ nix build -f. binaries.tezos-client\nto build the `tezos-client` binary.\n+#### Using docker\n+\n+As an alternative one can build tezos binaries without nix using docker.\n+\n+[`docker-static-build.sh`](docker/docker-static-build.sh) will build these binaries\n+using custom alpine image. In order to do that run the following commands:\n+```sh\n+cd docker\n+./docker-static-build.sh\n+```\n+After that, `docker` directory will contain built static binaries.\n+\n<a name=\"deb\"></a>\n### Ubuntu `.deb` packages\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Update README
Problem: Now it's possible to build static binaries without nix.
Solution: Mention this in README.
|
603,652
|
09.06.2020 12:02:01
| -10,800
|
f83d0d74f94676216d461a434b914c7990e12e48
|
Extract test-binaries from nix
Problem: Now we have two ways to get static tezos-binaries: nix and
docker, we want to test all these binaries using some simple
shell-script scenario.
Solution: Move test-binaries derivation from default.nix to separate
shell script and use it for nix built binaries.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -25,7 +25,8 @@ steps:\n- ./rpm-packages/*\nbranches: \"!master\"\n- commands:\n- - nix-build -A test-binaries --no-out-link\n+ - nix-build -A binaries -o binaries\n+ - ./scripts/test-binaries.sh binaries/bin\nlabel: test binaries\nbranches: \"!master\"\n- commands:\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -58,21 +58,4 @@ let\nrelease =\npkgs.callPackage ./release.nix { inherit source bundled timestamp; };\n- test-binaries = pkgs.runCommand \"test-binaries\" { } ''\n- for f in ${bundled.binaries}/bin/*; do\n- echo \"$f\"\n- \"$f\" --help &> /dev/null\n- done\n- # Test that tezos-node run works for carthagenet\n- ${bundled.binaries}/bin/tezos-node config init --data-dir node-dir --network carthagenet\n- ${bundled.binaries}/bin/tezos-node identity generate 1 --data-dir node-dir\n- timeout --preserve-status 5 ${bundled.binaries}/bin/tezos-node run --data-dir node-dir --network carthagenet\n- rm -rf node-dir\n- # Test that tezos-node run works for mainnet\n- ${bundled.binaries}/bin/tezos-node config init --data-dir node-dir --network mainnet\n- ${bundled.binaries}/bin/tezos-node identity generate 1 --data-dir node-dir\n- timeout --preserve-status 5 ${bundled.binaries}/bin/tezos-node run --data-dir node-dir --network mainnet\n- touch $out\n- '';\n-\n-in bundled // rec { inherit test-binaries release; }\n+in bundled // rec { inherit release; }\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/test-binaries.sh",
"diff": "+#!/usr/bin/env bash\n+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# This script takes the filepath to the directory with tezos-binaries\n+# and test that they act normal within some simple scenarios\n+\n+set -euo pipefail\n+\n+binaries=\"$1\"\n+\n+for f in \"$binaries\"/tezos-*; do\n+ echo \"$f\"\n+ \"./$f\" --help &> /dev/null\n+done\n+\n+# Test that tezos-node run works for carthagenet\n+\"./$binaries/tezos-node\" config init --data-dir node-dir --network carthagenet\n+\"./$binaries/tezos-node\" identity generate 1 --data-dir node-dir\n+timeout --preserve-status 5 \"./$binaries/tezos-node\" run --data-dir node-dir --network carthagenet\n+rm -rf node-dir\n+\n+# Test that tezos-node run works for mainnet\n+\"./$binaries/tezos-node\" config init --data-dir node-dir --network mainnet\n+\"./$binaries/tezos-node\" identity generate 1 --data-dir node-dir\n+timeout --preserve-status 5 \"./$binaries/tezos-node\" run --data-dir node-dir --network mainnet\n+rm -rf node-dir\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Extract test-binaries from nix
Problem: Now we have two ways to get static tezos-binaries: nix and
docker, we want to test all these binaries using some simple
shell-script scenario.
Solution: Move test-binaries derivation from default.nix to separate
shell script and use it for nix built binaries.
|
603,652
|
10.06.2020 10:24:19
| -10,800
|
4b3d3ed40065b925f460b69f77f59b1d11e0d8bf
|
Build docker binaries in CI
Problem: Now we have a way to build binaries using docker, we should
also have to automate this building in CI in order to test docker based
binaries.
Solution: Add step for building binaries using docker.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -29,6 +29,12 @@ steps:\n- ./scripts/test-binaries.sh binaries/bin\nlabel: test binaries\nbranches: \"!master\"\n+ - commands:\n+ - cd docker\n+ - nix run nixpkgs.docker -c ./docker-static-build.sh\n+ artifact_paths:\n+ - ./tezos-*\n+ label: build using docker\n- commands:\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nlabel: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Build docker binaries in CI
Problem: Now we have a way to build binaries using docker, we should
also have to automate this building in CI in order to test docker based
binaries.
Solution: Add step for building binaries using docker.
|
603,652
|
10.06.2020 11:22:57
| -10,800
|
8a890be8a96f0eef22bc896f6bdf48cf2a9cda47
|
Inherit commonMeta in release.nix
Problem: release.nix has hardcoded release number which is really easy
forget to change, it's safer to use the meta as in default.nix
Solution: Reuse commonMeta from default.nix in release.nix.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -56,6 +56,6 @@ let\nbundled = builtins.mapAttrs bundle artifacts;\nrelease =\n- pkgs.callPackage ./release.nix { inherit source bundled timestamp; };\n+ pkgs.callPackage ./release.nix { inherit bundled timestamp commonMeta; };\nin bundled // rec { inherit release; }\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ writeTextDir, runCommand, buildEnv, timestamp, bundled, source }:\n+{ writeTextDir, runCommand, buildEnv, timestamp, bundled, commonMeta }:\nlet\nprotocols = import ./protocols.nix;\nrelease-binaries = import ./release-binaries.nix;\nrelease-notes = writeTextDir \"release-notes.md\" ''\nAutomatic release on ${builtins.substring 0 8 timestamp}\n- This release contains assets based on [${source.ref} release](https://gitlab.com/tezos/tezos/tree/${source.ref}).\n+ This release contains assets based on [${commonMeta.branchName} release](https://gitlab.com/tezos/tezos/tree/${commonMeta.branchName}).\nBinaries without protocol suffixes support the following protocols (unsupported protocols are listed for reference):\n${builtins.concatStringsSep \"\\n\" (map (x: \"- [ ] `${x}`\") protocols.ignored\n@@ -24,10 +24,10 @@ let\nname = \"tezos-release-no-tarball\";\npaths = [ \"${bundled.binaries}/bin\" LICENSE release-notes ];\n};\n- tarballName = \"binaries-${builtins.replaceStrings [\"v\"] [\"\"] source.ref}-1.tar.gz\";\n+ tarballName = \"binaries-${commonMeta.version}-${commonMeta.release}.tar.gz\";\nbinariesTarball = runCommand \"binaries-tarball\" { }\n\"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${tarballName} -C ${bundled.binaries}/bin .\";\n- LICENSE = writeTextDir \"LICENSE\" (builtins.readFile \"${source}/LICENSE\");\n+ LICENSE = writeTextDir \"LICENSE\" (builtins.readFile commonMeta.licenseFile);\nin buildEnv {\nname = \"tezos-release\";\npaths = [ releaseNoTarball binariesTarball ];\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Inherit commonMeta in release.nix
Problem: release.nix has hardcoded release number which is really easy
forget to change, it's safer to use the meta as in default.nix
Solution: Reuse commonMeta from default.nix in release.nix.
|
603,652
|
10.06.2020 11:10:06
| -10,800
|
6420c79b9a00e6c2f155f0f8203c19142e7c746b
|
Test binaries build by docker
Problem: Now we also produce tezos binaries using docker, we should test
produced binaries as well.
Solution: Test them using `test-binaries.sh` script.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -32,9 +32,10 @@ steps:\n- commands:\n- cd docker\n- nix run nixpkgs.docker -c ./docker-static-build.sh\n+ - cd .. && ./scripts/test-binaries.sh docker\nartifact_paths:\n- - ./tezos-*\n- label: build using docker\n+ - ./docker/tezos-*\n+ label: build using docker and test binaries\n- commands:\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nlabel: create auto pre-release\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Test binaries build by docker
Problem: Now we also produce tezos binaries using docker, we should test
produced binaries as well.
Solution: Test them using `test-binaries.sh` script.
|
603,652
|
15.06.2020 16:43:40
| -10,800
|
599a567db8f70bb42dd929869aaf48c9fffaeeda
|
Compress binaries built by docker
Problem: Binaries built by docker are much larger that binaries built by
nix.
Solution: Compress them using UPX.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -32,6 +32,7 @@ steps:\n- commands:\n- cd docker\n- nix run nixpkgs.docker -c ./docker-static-build.sh\n+ - nix run nixpkgs.upx -c upx tezos-*\n- cd .. && ./scripts/test-binaries.sh docker\nartifact_paths:\n- ./docker/tezos-*\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Compress binaries built by docker
Problem: Binaries built by docker are much larger that binaries built by
nix.
Solution: Compress them using UPX.
|
603,652
|
15.06.2020 16:46:58
| -10,800
|
c50a2b69876936bda678ece7f318d0f47c369842
|
Use docker binaries in releases
Problem: Now we have a way to build binaries using docker, we want to
use these binaries in releases.
Solution: Rework existing release mechanism a bit. Now instead of
building nix derivation, it uses path to the directory with tezos
binaries.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -38,6 +38,9 @@ steps:\n- ./docker/tezos-*\nlabel: build using docker and test binaries\n- commands:\n+ - mkdir binaries\n+ - buildkite-agent artifact download \"docker/*\" binaries --step \"build using docker and test binaries\"\n+ - ls binaries\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\nlabel: create auto pre-release\nbranches: master\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "default.nix",
"diff": "+# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+{ timestamp ? \"19700101\", docker-binaries ? null }:\n+let\n+ pkgs = import ./nix/pkgs.nix { };\n+ source = (import ./nix/nix/sources.nix).tezos;\n+ commonMeta = {\n+ # release should be updated in case we change something\n+ release = \"2\";\n+ # we switched from time-based versioning to proper tezos versioning\n+ epoch = \"1\";\n+ version = builtins.replaceStrings [ \"v\" ] [ \"\" ] source.ref;\n+ license = \"MPL-2.0\";\n+ dependencies = \"\";\n+ maintainer = \"Serokell https://serokell.io <hi@serokell.io>\";\n+ branchName = source.ref;\n+ licenseFile = \"${source}/LICENSE\";\n+ };\n+ release =\n+ pkgs.callPackage ./release.nix { binaries = docker-binaries; inherit timestamp commonMeta; };\n+\n+in { inherit release commonMeta; }\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "@@ -15,18 +15,7 @@ let\nvalue = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n}) release-binaries);\n- commonMeta = {\n- # release should be updated in case we change something\n- release = \"2\";\n- # we switched from time-based versioning to proper tezos versioning\n- epoch = \"1\";\n- version = builtins.replaceStrings [ \"v\" ] [ \"\" ] source.ref;\n- license = \"MPL-2.0\";\n- dependencies = \"\";\n- maintainer = \"Serokell https://serokell.io <hi@serokell.io>\";\n- branchName = source.ref;\n- licenseFile = \"${source}/LICENSE\";\n- };\n+ inherit (import ../. {}) commonMeta;\nrpmMeta = { arch = \"x86_64\"; };\ndebMeta = {\narch = \"amd64\";\n@@ -55,7 +44,4 @@ let\nartifacts = { inherit binaries deb rpm debSource rpmSource; };\nbundled = builtins.mapAttrs bundle artifacts;\n- release =\n- pkgs.callPackage ./release.nix { inherit bundled timestamp commonMeta; };\n-\n-in bundled // rec { inherit release; }\n+in bundled\n"
},
{
"change_type": "RENAME",
"old_path": "nix/release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ writeTextDir, runCommand, buildEnv, timestamp, bundled, commonMeta }:\n+{ writeTextDir, runCommand, buildEnv, timestamp, binaries, commonMeta }:\nlet\n- protocols = import ./protocols.nix;\n- release-binaries = import ./release-binaries.nix;\n+ release-binaries = import ./nix/release-binaries.nix;\nrelease-notes = writeTextDir \"release-notes.md\" ''\nAutomatic release on ${builtins.substring 0 8 timestamp}\nThis release contains assets based on [${commonMeta.branchName} release](https://gitlab.com/tezos/tezos/tree/${commonMeta.branchName}).\n- Binaries without protocol suffixes support the following protocols (unsupported protocols are listed for reference):\n- ${builtins.concatStringsSep \"\\n\" (map (x: \"- [ ] `${x}`\") protocols.ignored\n- ++ map (x: \"- [x] `${x}`\") (protocols.allowed ++ protocols.active))}\n-\nDescriptions for binaries included in this release:\n${builtins.concatStringsSep \"\\n\"\n(map ({ name, description, ... }: \"- `${name}`: ${description}\")\n@@ -22,11 +17,11 @@ let\n'';\nreleaseNoTarball = buildEnv {\nname = \"tezos-release-no-tarball\";\n- paths = [ \"${bundled.binaries}/bin\" LICENSE release-notes ];\n+ paths = [ \"${binaries}\" LICENSE release-notes ];\n};\ntarballName = \"binaries-${commonMeta.version}-${commonMeta.release}.tar.gz\";\nbinariesTarball = runCommand \"binaries-tarball\" { }\n- \"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${tarballName} -C ${bundled.binaries}/bin .\";\n+ \"mkdir $out; tar --owner=serokell:1000 --mode='u+rwX' -czhf $out/${tarballName} -C ${binaries} .\";\nLICENSE = writeTextDir \"LICENSE\" (builtins.readFile commonMeta.licenseFile);\nin buildEnv {\nname = \"tezos-release\";\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/autorelease.sh",
"new_path": "scripts/autorelease.sh",
"diff": "@@ -19,7 +19,7 @@ trap finish EXIT\nassets_dir=$TEMPDIR/assets\n# Build release.nix\n-nix-build ./nix -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\"\n+nix-build -A release -o \"$TEMPDIR\"/\"$project\" --arg timestamp \"$(date +\\\"%Y%m%d%H%M\\\")\" --arg docker-binaries ./binaries/docker\nmkdir -p \"$assets_dir\"\n# Move archive with binaries and tezos license to assets\nshopt -s extglob\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Use docker binaries in releases
Problem: Now we have a way to build binaries using docker, we want to
use these binaries in releases.
Solution: Rework existing release mechanism a bit. Now instead of
building nix derivation, it uses path to the directory with tezos
binaries.
|
603,652
|
18.06.2020 15:46:19
| -10,800
|
8deef1083be14c27b5fa9dc1f131011a55b4d542
|
Reorganize repo structure more
Problem: Currently `nix/` is a bit messy, files for building and
packaging are located together.
Solution: Move all building related nix files to `nix/build`, all
packaging related files to `nix/package`, leave high-level files in the
`nix/`.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "{ timestamp ? \"19700101\", docker-binaries ? null }:\nlet\n- pkgs = import ./nix/pkgs.nix { };\n+ pkgs = import ./nix/build/pkgs.nix { };\nsource = (import ./nix/nix/sources.nix).tezos;\ncommonMeta = {\n# release should be updated in case we change something\n"
},
{
"change_type": "RENAME",
"old_path": "nix/bin.nix",
"new_path": "nix/build/bin.nix",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/hacks.nix",
"new_path": "nix/build/hacks.nix",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/ocaml-overlay.nix",
"new_path": "nix/build/ocaml-overlay.nix",
"diff": "# SPDX-License-Identifier: MPL-2.0\n{ sources ? import ./nix/sources.nix\n-, protocols ? builtins.fromJSON (builtins.readFile ./protocols.json)\n+, protocols ? builtins.fromJSON (builtins.readFile ../protocols.json)\n, hacks ? import ./hacks.nix\n, pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }:\nself: super: {\n"
},
{
"change_type": "RENAME",
"old_path": "nix/pkgs.nix",
"new_path": "nix/build/pkgs.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }:\n+{ sources ? import ../nix/sources.nix, pkgs ? import sources.nixpkgs { } }:\nlet\nocaml-overlay = import ./ocaml-overlay.nix { inherit sources pkgs; };\nstatic-overlay = import ./static-overlay.nix;\n"
},
{
"change_type": "RENAME",
"old_path": "nix/release-binaries.nix",
"new_path": "nix/build/release-binaries.nix",
"diff": "# SPDX-License-Identifier: MPL-2.0\nlet\n- protocols = import ./protocols.nix;\n+ protocols = import ../protocols.nix;\nprotocolsFormatted =\nbuiltins.concatStringsSep \", \" (protocols.allowed ++ protocols.active);\nin [\n"
},
{
"change_type": "RENAME",
"old_path": "nix/static-overlay.nix",
"new_path": "nix/build/static-overlay.nix",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/stdlib-unix.patch",
"new_path": "nix/build/stdlib-unix.patch",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "{ timestamp ? \"19700101\", patches ? [ ], date ? \"Thu, 1 Jan 1970 10:00:00 +0300\"\n, builderInfo ? \"\", ubuntuVersion ? \"bionic\" }:\nlet\n- pkgs = import ./pkgs.nix { };\n+ pkgs = import ./build/pkgs.nix { };\nsource = (import ./nix/sources.nix).tezos;\nprotocols = import ./protocols.nix;\n- bin = pkgs.callPackage ./bin.nix { };\n- release-binaries = import ./release-binaries.nix;\n+ bin = pkgs.callPackage ./build/bin.nix { };\n+ release-binaries = import ./build/release-binaries.nix;\nbinaries = builtins.listToAttrs (map (meta: {\ninherit (meta) name;\nvalue = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; };\n@@ -22,14 +22,14 @@ let\ninherit builderInfo ubuntuVersion date;\n};\ndeb = builtins.mapAttrs\n- (_: pkgs.callPackage ./deb.nix { meta = commonMeta // debMeta; }) binaries;\n+ (_: pkgs.callPackage ./package/deb.nix { meta = commonMeta // debMeta; }) binaries;\nrpm = builtins.mapAttrs\n- (_: pkgs.callPackage ./rpm.nix { meta = commonMeta // rpmMeta; }) binaries;\n+ (_: pkgs.callPackage ./package/rpm.nix { meta = commonMeta // rpmMeta; }) binaries;\ndebSource = builtins.mapAttrs\n- (_: pkgs.callPackage ./debSource.nix { meta = commonMeta // debMeta; })\n+ (_: pkgs.callPackage ./package/debSource.nix { meta = commonMeta // debMeta; })\nbinaries;\nrpmSource = builtins.mapAttrs (_:\n- pkgs.callPackage ./rpm.nix {\n+ pkgs.callPackage ./package/rpm.nix {\nmeta = commonMeta // rpmMeta;\nbuildSourcePackage = true;\n}) binaries;\n"
},
{
"change_type": "RENAME",
"old_path": "nix/deb.nix",
"new_path": "nix/package/deb.nix",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/debSource.nix",
"new_path": "nix/package/debSource.nix",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/rpm.nix",
"new_path": "nix/package/rpm.nix",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "{ writeTextDir, runCommand, buildEnv, timestamp, binaries, commonMeta }:\nlet\n- release-binaries = import ./nix/release-binaries.nix;\n+ release-binaries = import ./nix/build/release-binaries.nix;\nrelease-notes = writeTextDir \"release-notes.md\" ''\nAutomatic release on ${builtins.substring 0 8 timestamp}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Reorganize repo structure more
Problem: Currently `nix/` is a bit messy, files for building and
packaging are located together.
Solution: Move all building related nix files to `nix/build`, all
packaging related files to `nix/package`, leave high-level files in the
`nix/`.
|
603,652
|
18.06.2020 15:50:16
| -10,800
|
e3398f7e758ffa155b93695f00933de0eade539c
|
Remove timestamp usage
Problem: We no longer use timestamp based versioning, the only place
where timestamp is used is generated autorelease header. It doesn't make
much sense to use timestamp anymore.
Solution: Remove timestamp usage.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ timestamp ? \"19700101\", docker-binaries ? null }:\n+{ docker-binaries ? null }:\nlet\npkgs = import ./nix/build/pkgs.nix { };\nsource = (import ./nix/nix/sources.nix).tezos;\n@@ -19,6 +19,6 @@ let\nlicenseFile = \"${source}/LICENSE\";\n};\nrelease =\n- pkgs.callPackage ./release.nix { binaries = docker-binaries; inherit timestamp commonMeta; };\n+ pkgs.callPackage ./release.nix { binaries = docker-binaries; inherit commonMeta; };\nin { inherit release commonMeta; }\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/default.nix",
"new_path": "nix/default.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ timestamp ? \"19700101\", patches ? [ ], date ? \"Thu, 1 Jan 1970 10:00:00 +0300\"\n+{ patches ? [ ], date ? \"Thu, 1 Jan 1970 10:00:00 +0300\"\n, builderInfo ? \"\", ubuntuVersion ? \"bionic\" }:\nlet\npkgs = import ./build/pkgs.nix { };\n"
},
{
"change_type": "MODIFY",
"old_path": "release.nix",
"new_path": "release.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-{ writeTextDir, runCommand, buildEnv, timestamp, binaries, commonMeta }:\n+{ writeTextDir, runCommand, buildEnv, binaries, commonMeta }:\nlet\nrelease-binaries = import ./nix/build/release-binaries.nix;\nrelease-notes = writeTextDir \"release-notes.md\" ''\n- Automatic release on ${builtins.substring 0 8 timestamp}\n+ Automatic release\nThis release contains assets based on [${commonMeta.branchName} release](https://gitlab.com/tezos/tezos/tree/${commonMeta.branchName}).\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#9] Remove timestamp usage
Problem: We no longer use timestamp based versioning, the only place
where timestamp is used is generated autorelease header. It doesn't make
much sense to use timestamp anymore.
Solution: Remove timestamp usage.
|
603,652
|
18.06.2020 12:49:21
| -10,800
|
37820697352dc12048d8be6b693bcb11e4b73813
|
Extend binaries testing
Problem: We want to extend binary testing to prevent unexpected bug
appearance in the future.
Solution: Use nixos tests framework for testing tezos binaries, port
and extend existing testing scenario to it, add scenario for testing
daemons and tezos-admin-client.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "@@ -25,15 +25,16 @@ steps:\n- ./rpm-packages/*\nbranches: \"!master\"\n- commands:\n- - nix-build ./nix -A binaries -o binaries\n- - ./scripts/test-binaries.sh binaries/bin\n+ - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build and package\"\n+ - chmod +x ./binaries/bin/*\n+ - nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./binaries/bin\nlabel: test binaries\nbranches: \"!master\"\n- commands:\n- cd docker\n- nix run nixpkgs.docker -c ./docker-static-build.sh\n- nix run nixpkgs.upx -c upx tezos-*\n- - cd .. && ./scripts/test-binaries.sh docker\n+ - cd .. && nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\nartifact_paths:\n- ./docker/tezos-*\nlabel: build using docker and test binaries\n"
},
{
"change_type": "DELETE",
"old_path": "scripts/test-binaries.sh",
"new_path": null,
"diff": "-#!/usr/bin/env bash\n-# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n-#\n-# SPDX-License-Identifier: MPL-2.0\n-\n-# This script takes the filepath to the directory with tezos-binaries\n-# and test that they act normal within some simple scenarios\n-\n-set -euo pipefail\n-\n-binaries=\"$1\"\n-\n-for f in \"$binaries\"/tezos-*; do\n- echo \"$f\"\n- \"./$f\" --help &> /dev/null\n-done\n-\n-# Test that tezos-node run works for carthagenet\n-\"./$binaries/tezos-node\" config init --data-dir node-dir --network carthagenet\n-\"./$binaries/tezos-node\" identity generate 1 --data-dir node-dir\n-timeout --preserve-status 5 \"./$binaries/tezos-node\" run --data-dir node-dir --network carthagenet\n-rm -rf node-dir\n-\n-# Test that tezos-node run works for mainnet\n-\"./$binaries/tezos-node\" config init --data-dir node-dir --network mainnet\n-\"./$binaries/tezos-node\" identity generate 1 --data-dir node-dir\n-timeout --preserve-status 5 \"./$binaries/tezos-node\" run --data-dir node-dir --network mainnet\n-rm -rf node-dir\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/test_script.py",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# This script is used in tezos-binaries.nix and isn't supposed to be run\n+# other way than 'nix-build tezos-binaries.nix'\n+machine.succeed('export TEZOS_LOG=\"* -> warning\"')\n+machine.succeed(\"mkdir client-dir\")\n+machine.succeed(\"mkdir signer-dir\")\n+with subtest(\"run binaries with --help\"):\n+ for b in binaries:\n+ machine.succeed(b + \" --help\")\n+\n+\n+machine.succeed(f\"{tezos_client} -d client-dir gen keys baker\")\n+\n+\n+def pkill_background(binary):\n+ machine.succeed(\"pkill \" + binary)\n+\n+\n+def run_node(network, use_tls):\n+ machine.succeed(\"rm -rf node-dir\")\n+ machine.succeed(\"mkdir node-dir\")\n+ if use_tls:\n+ machine.succeed(f\"{openssl} genrsa 2048 > host.key\")\n+ machine.succeed(\n+ f\"{openssl} req -new -x509 -nodes -sha256 -days 365 -key host.key -out host.cert -subj '/'\"\n+ )\n+ tls_args = \" --rpc-tls=host.cert,host.key \" if use_tls else \" \"\n+ machine.succeed(f\"{tezos_node} config init --data-dir node-dir --network {network}\")\n+ machine.succeed(f\"{tezos_node} identity generate 1 --data-dir node-dir\")\n+ machine.succeed(\n+ f\"{tezos_node} run --data-dir node-dir --rpc-addr 127.0.0.1:8732 \"\n+ + tls_args\n+ + \"--no-bootstrap-peers --network \"\n+ + network\n+ + \" &\"\n+ )\n+ tls_flag = \" -S \" if use_tls else \" \"\n+ machine.wait_until_succeeds(\n+ tezos_client + tls_flag + \"rpc get chains/main/blocks/head/\"\n+ )\n+\n+\n+def run_node_with_daemons(network, use_tls):\n+ run_node(network, use_tls)\n+ tls_flag = \" -S \" if use_tls else \" \"\n+ machine.succeed(\n+ f\"{tezos_baker} -d client-dir\"\n+ + tls_flag\n+ + \"run with local node node-dir baker &\"\n+ )\n+ machine.succeed(tezos_endorser + tls_flag + \"-d client-dir run baker &\")\n+ machine.succeed(tezos_accuser + tls_flag + \"-d client-dir run &\")\n+\n+\n+def kill_node_with_daemons():\n+ pkill_background(\"tezos-accuser\")\n+ pkill_background(\"tezos-endorser\")\n+ pkill_background(\"tezos-baker\")\n+ pkill_background(\"tezos-node\")\n+\n+\n+def test_node_with_daemons_scenario(network, use_tls=False):\n+ tls_flag = \" -S \" if use_tls else \" \"\n+ run_node_with_daemons(network, use_tls)\n+ machine.succeed(tezos_admin_client + tls_flag + \"rpc get chains/main/blocks/head/\")\n+ kill_node_with_daemons()\n+\n+\n+with subtest(\"run node with daemons on carthagenet\"):\n+ test_node_with_daemons_scenario(\"carthagenet\")\n+\n+with subtest(\"run node with daemons on mainnet\"):\n+ test_node_with_daemons_scenario(\"mainnet\")\n+\n+with subtest(\"run node with daemons using tls\"):\n+ test_node_with_daemons_scenario(\"carthagenet\", use_tls=True)\n+\n+with subtest(\"test remote signer\"):\n+ machine.succeed(f\"{tezos_signer} -d signer-dir gen keys signer\")\n+ signer_addr = machine.succeed(\n+ f'{tezos_signer} -d signer-dir show address signer | head -n 1 | sed -e s/^\"Hash: \"//g'\n+ )\n+ machine.succeed(\n+ f\"{tezos_signer} -d signer-dir launch socket signer -a 127.0.0.1 -p 22000 &\"\n+ )\n+ machine.succeed(\n+ f\"{tezos_client} -d client-dir import secret key remote-signer-tcp tcp://127.0.0.1:22000/{signer_addr}\"\n+ )\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/tezos-binaries.nix",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+{ path-to-binaries ? null } @ args:\n+import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, ... }:\n+{\n+ nodes.machine = { ... }: { virtualisation.memorySize = 1024; };\n+\n+ testScript = ''\n+ path_to_binaries = \"${path-to-binaries}\"\n+ tezos_accuser = f\"{path_to_binaries}/tezos-accuser-006-PsCARTHA\"\n+ tezos_admin_client = f\"{path_to_binaries}/tezos-admin-client\"\n+ tezos_baker = f\"{path_to_binaries}/tezos-baker-006-PsCARTHA\"\n+ tezos_client = f\"{path_to_binaries}/tezos-client\"\n+ tezos_endorser = f\"{path_to_binaries}/tezos-endorser-006-PsCARTHA\"\n+ tezos_node = f\"{path_to_binaries}/tezos-node\"\n+ tezos_signer = f\"{path_to_binaries}/tezos-signer\"\n+ openssl = \"${pkgs.openssl.bin}/bin/openssl\"\n+ binaries = [\n+ tezos_accuser,\n+ tezos_admin_client,\n+ tezos_baker,\n+ tezos_client,\n+ tezos_endorser,\n+ tezos_node,\n+ tezos_signer,\n+ ]\n+ ${builtins.readFile ./test_script.py}'';\n+}) args\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#55] Extend binaries testing
Problem: We want to extend binary testing to prevent unexpected bug
appearance in the future.
Solution: Use nixos tests framework for testing tezos binaries, port
and extend existing testing scenario to it, add scenario for testing
daemons and tezos-admin-client.
|
603,652
|
23.06.2020 14:23:58
| -10,800
|
5fae5e436385c703c93dd569915b1b6d424151f3
|
Clean up pipeline.yml
Problem: Labels now are a bit outdated in the pipeline configuration.
Solution: Move them to be before actual command sequence and update.
Also update copyright year info. Also split building and testing docker
binaries into two different steps, IMO, this looks a bit better.
|
[
{
"change_type": "MODIFY",
"old_path": ".buildkite/pipeline.yml",
"new_path": ".buildkite/pipeline.yml",
"diff": "-# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n+# SPDX-FileCopyrightText: 2019-2020 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\nenv:\nNIX_PATH: nixpkgs=https://github.com/serokell/nixpkgs/archive/master.tar.gz\n- cur_date: '$(date --date=\"$(git show --no-patch --format=%ci)\" +\"%Y%m%d%H%M\")'\nsteps:\n- - command: nix run nixpkgs.reuse -c reuse lint\n- label: reuse lint\n- - command: .buildkite/check-trailing-whitespace.sh\n- label: check trailing whitespace\n- - command: \"nix run -f https://github.com/serokell/crossref-verifier/archive/68a1f9d25b6e7835fea8299b18a3e6c61dbb2a5c.tar.gz -c crossref-verify\"\n- label: crossref-verify\n+ - label: reuse lint\n+ command: nix run -f . pkgs.reuse -c reuse lint\n+ - label: check trailing whitespace\n+ command: .buildkite/check-trailing-whitespace.sh\n+ - label: crossref-verify\n+ command: \"nix run -f https://github.com/serokell/crossref-verifier/archive/68a1f9d25b6e7835fea8299b18a3e6c61dbb2a5c.tar.gz -c crossref-verify\"\nsoft_fail: true\n- - commands:\n+\n+ - label: build and package via nix\n+ commands:\n- nix-build ./nix -A binaries -o binaries\n- - nix-build ./nix -A deb -o deb-packages --arg timestamp ${cur_date}\n- - nix-build ./nix -A rpm -o rpm-packages --arg timestamp ${cur_date}\n- label: build and package\n+ - nix-build ./nix -A deb -o deb-packages\n+ - nix-build ./nix -A rpm -o rpm-packages\nartifact_paths:\n- ./binaries/bin/*\n- ./deb-packages/*\n- ./rpm-packages/*\nbranches: \"!master\"\n- - commands:\n- - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build and package\"\n+ - label: test nix-built binaries\n+ commands:\n+ - buildkite-agent artifact download \"binaries/bin/*\" . --step \"build and package via nix\"\n- chmod +x ./binaries/bin/*\n- nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./binaries/bin\n- label: test binaries\nbranches: \"!master\"\n- - commands:\n+\n+ - label: build via docker\n+ commands:\n- cd docker\n- - nix run nixpkgs.docker -c ./docker-static-build.sh\n- - nix run nixpkgs.upx -c upx tezos-*\n- - cd .. && nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\n+ - nix run -f.. pkgs.docker -c ./docker-static-build.sh\n+ - nix run -f.. pkgs.upx -c upx tezos-*\nartifact_paths:\n- ./docker/tezos-*\n- label: build using docker and test binaries\n- - commands:\n+ - label: test docker-built binaries\n+ commands:\n+ - buildkite-agent artifact download \"docker/*\" . --step \"build via docker\"\n+ - chmod +x ./docker/*\n+ - nix-build tests/tezos-binaries.nix --no-out-link --arg path-to-binaries ./docker\n+ branches: \"!master\"\n+\n+ - label: create auto pre-release\n+ commands:\n- mkdir binaries\n- - buildkite-agent artifact download \"docker/*\" binaries --step \"build using docker and test binaries\"\n+ - buildkite-agent artifact download \"docker/*\" binaries --step \"build via docker\"\n- ls binaries\n- GITHUB_TOKEN=$(cat ~/niv-bot-token) ./scripts/autorelease.sh\n- label: create auto pre-release\nbranches: master\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -21,4 +21,4 @@ let\nrelease =\npkgs.callPackage ./release.nix { binaries = docker-binaries; inherit commonMeta; };\n-in { inherit release commonMeta; }\n+in { inherit release commonMeta pkgs; }\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Clean up pipeline.yml
Problem: Labels now are a bit outdated in the pipeline configuration.
Solution: Move them to be before actual command sequence and update.
Also update copyright year info. Also split building and testing docker
binaries into two different steps, IMO, this looks a bit better.
|
603,652
|
25.06.2020 10:54:05
| -10,800
|
9839b5b75769dad8327d09be5f84a6b332d9e871
|
Bump tezos to v7.2
Problem: Tezos recently had new v7.2 release, we should update our
packaging as well.
Solution: Bump tezos to v7.2 :shrug:.
|
[
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "@@ -8,7 +8,7 @@ let\nsource = (import ./nix/nix/sources.nix).tezos;\ncommonMeta = {\n# release should be updated in case we change something\n- release = \"2\";\n+ release = \"1\";\n# we switched from time-based versioning to proper tezos versioning\nepoch = \"1\";\nversion = builtins.replaceStrings [ \"v\" ] [ \"\" ] source.ref;\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/Dockerfile",
"new_path": "docker/Dockerfile",
"diff": "@@ -13,7 +13,7 @@ RUN git clone --single-branch --branch hidapi-0.9.0 https://github.com/libusb/hi\nRUN cd hidapi && autoreconf -fvi && ./bootstrap && ./configure && make && make install\nRUN rm -rf libusb hidapi\nCOPY ./static_libs.patch /static.patch\n-RUN git clone --single-branch --branch v7.1 https://gitlab.com/tezos/tezos.git --depth 1\n+RUN git clone --single-branch --branch v7.2 https://gitlab.com/tezos/tezos.git --depth 1\nWORKDIR /tezos\nRUN git apply ../static.patch\nRUN export OPAMYES=\"true\" && opam init --bare --disable-sandboxing && make build-deps\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"v7.1\",\n+ \"ref\": \"v7.2\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"51977265590ba5fbd166b921e265fa22bf9f66a6\",\n+ \"rev\": \"6b9f3bc3c90d99d4a2bd5cd26e6f3efbcb977090\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Bump tezos to v7.2
Problem: Tezos recently had new v7.2 release, we should update our
packaging as well.
Solution: Bump tezos to v7.2 :shrug:.
|
603,652
|
29.06.2020 15:35:51
| -10,800
|
94753fe6220f5d6e7f6436c85a3b470c42585629
|
Extract meta for packaging to json
Problem: We want to package tezos for ubuntu in a nix-less way. All meta
information for this in currently stored in the .nix files.
Solution: Put it to json and use in both nix and nix-less ways.
|
[
{
"change_type": "MODIFY",
"old_path": ".reuse/dep5",
"new_path": ".reuse/dep5",
"diff": "Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\n-Files: .github/* nix/* protocols.json\n+Files: .github/* nix/* protocols.json meta.json\nCopyright: TQ Tezos <https://tqtezos.com>\nLicense: MPL-2.0\n"
},
{
"change_type": "MODIFY",
"old_path": "default.nix",
"new_path": "default.nix",
"diff": "let\npkgs = import ./nix/build/pkgs.nix { };\nsource = (import ./nix/nix/sources.nix).tezos;\n+ meta = builtins.fromJSON (builtins.readFile ./meta.json);\ncommonMeta = {\n- # release should be updated in case we change something\n- release = \"1\";\n- # we switched from time-based versioning to proper tezos versioning\n- epoch = \"1\";\nversion = builtins.replaceStrings [ \"v\" ] [ \"\" ] source.ref;\nlicense = \"MPL-2.0\";\ndependencies = \"\";\n- maintainer = \"Serokell https://serokell.io <hi@serokell.io>\";\nbranchName = source.ref;\nlicenseFile = \"${source}/LICENSE\";\n- };\n+ } // meta;\nrelease =\npkgs.callPackage ./release.nix { binaries = docker-binaries; inherit commonMeta; };\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "meta.json",
"diff": "+{\n+ \"release\": \"1\",\n+ \"epoch\": \"1\",\n+ \"maintainer\": \"Serokell <hi@serokell.io>\"\n+}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#56] Extract meta for packaging to json
Problem: We want to package tezos for ubuntu in a nix-less way. All meta
information for this in currently stored in the .nix files.
Solution: Put it to json and use in both nix and nix-less ways.
|
603,652
|
29.06.2020 16:37:35
| -10,800
|
d3afe4c07de12603ad656a475b239920431165d4
|
Move static docker stuff to docker/build
Problem: We are going to have two images for building static binaries
and ubuntu packages. It's make sense to use same directory structure as
in nix directory.
Solution: Move all static building related files to `docker/build`.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "## Statically built binaries\n-Currently, we support only static binaries building using custom alpine image.\n+Static binaries building using custom alpine image.\n[`docker-static-build.sh`](docker-static-build.sh) will build tezos binaries\n-image defined in [Dockerfile](Dockerfile). In order to build them, just run the script\n+image defined in [Dockerfile](build/Dockerfile). In order to build them, just run the script\n```\n./docker-static-build.sh\n```\n"
},
{
"change_type": "RENAME",
"old_path": "docker/Dockerfile",
"new_path": "docker/build/Dockerfile",
"diff": "@@ -12,7 +12,7 @@ RUN cd libusb && autoreconf -fvi && ./configure && make && make install\nRUN git clone --single-branch --branch hidapi-0.9.0 https://github.com/libusb/hidapi.git --depth 1\nRUN cd hidapi && autoreconf -fvi && ./bootstrap && ./configure && make && make install\nRUN rm -rf libusb hidapi\n-COPY ./static_libs.patch /static.patch\n+COPY ./build/static_libs.patch /static.patch\nRUN git clone --single-branch --branch v7.2 https://gitlab.com/tezos/tezos.git --depth 1\nWORKDIR /tezos\nRUN git apply ../static.patch\n"
},
{
"change_type": "RENAME",
"old_path": "docker/static_libs.patch",
"new_path": "docker/build/static_libs.patch",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "docker/docker-static-build.sh",
"new_path": "docker/docker-static-build.sh",
"diff": "@@ -13,7 +13,7 @@ binaries=(\"tezos-accuser-006-PsCARTHA\" \"tezos-admin-client\" \"tezos-baker-006-PsC\n\"tezos-client\" \"tezos-endorser-006-PsCARTHA\" \"tezos-node\" \"tezos-signer\"\n)\n-docker build -t alpine-tezos .\n+docker build -t alpine-tezos -f build/Dockerfile .\ncontainer_id=\"$(docker create alpine-tezos)\"\nfor b in \"${binaries[@]}\"; do\ndocker cp \"$container_id:/tezos/$b\" \"$b\"\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#56] Move static docker stuff to docker/build
Problem: We are going to have two images for building static binaries
and ubuntu packages. It's make sense to use same directory structure as
in nix directory.
Solution: Move all static building related files to `docker/build`.
|
603,652
|
08.07.2020 17:45:41
| -10,800
|
50896c6b0261dc372c159107be1909381f8d54a3
|
Update docker part README
|
[
{
"change_type": "MODIFY",
"old_path": "docker/README.md",
"new_path": "docker/README.md",
"diff": "@@ -16,3 +16,76 @@ image defined in [Dockerfile](build/Dockerfile). In order to build them, just ru\n./docker-static-build.sh\n```\nAfter that, directory will contain built static binaries.\n+\n+## Ubuntu packages\n+\n+We provide a way to build both binary and source native Ubuntu packages.\n+\n+[`docker-ubuntu-packages.sh`](docker-ubuntu-packages.sh) will build source or binary\n+packages depending on the passed argument (`source` and `binary` respectively).\n+This script builds packages inside docker image defined in [Dockerfile](package/Dockerfile).\n+This script uses [python script](package/package_generator.py) which generates meta information for\n+tezos packages based on information defined in [meta.json](../meta.json) and current tezos\n+version defined in [sources.json](../nix/nix/sources.json) and build native ubuntu packages.\n+\n+### `.deb` packages\n+\n+In order to build binary `.deb` packages run the following command:\n+```\n+cd .. && ./docker/docker-ubuntu-packages.sh binary\n+```\n+\n+It is also possible to build single package. In order to do that run the following:\n+```\n+# cd .. && ./docker/docker-ubuntu-packages.sh binary <tezos-binary-name>\n+# Example for baker\n+cd .. && ./docker/docker-ubuntu-packages.sh binary tezos-baker-006-PsCARTHA\n+```\n+\n+The build can take some time due to the fact that we build tezos and its dependencies\n+from scratch for each package individually.\n+\n+Once the build is completed the packages will be located in `../out` directory.\n+\n+In order to install `.deb` package run the following command:\n+```\n+sudo apt install <path to deb file>\n+```\n+\n+### Source packages and publishing them on Launchpad PPA\n+\n+In order to build source packages run the following command:\n+```\n+cd .. && ./docker/docker-ubuntu-packages.sh source\n+# you can also build single source package\n+cd .. && ./docker/docker-ubuntu-packages.sh source tezos-baker-006-PsCARTHA\n+```\n+\n+Once the packages build is complete `../out` directory will contain files required\n+for submitting packages to the Launchpad.\n+\n+There are 5 files for each package: `.orig.tar.gz`, `.debian.tar.xz`,\n+`.dsc`, `.build-info`, `.changes`.\n+\n+You can test source package building using [`pbuilder`](https://wiki.ubuntu.com/PbuilderHowto).\n+\n+In order to push the packages to the Launchpad PPA `*.changes` files should should be updated with\n+the submitter info and signed.\n+\n+In order to update `*.changes` files with the proper signer info run the following:\n+```\n+sed -i 's/^Changed-By: .*$/Changed-By: $signer_info/' ../out/*.changes\n+```\n+\n+For example, `signer_info` can be the following: `Roman Melnikov <roman.melnikov@serokell.io>`\n+\n+Once these files are updated, they should be signed using `debsign`.\n+```\n+debsign ../out/*.changes\n+```\n+\n+Signed files now can be submitted to Launchpad PPA. In order to do that run the following\n+command for each `.changes` file:\n+```\n+dput ppa:serokell/tezos ../out/<package>.changes\n+```\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#56] Update docker part README
|
603,652
|
13.07.2020 12:22:41
| -10,800
|
64c35724e29e462cbecc72a8486b189b320f5b97
|
Move protocols.json from nix/
Problem: Now we use information about active protocols in both nix and
nix-less parts of our code, so it doesn't make much sense to store it in
nix/ directory anymore.
Solution: Move protocols.json to the repository root.
|
[
{
"change_type": "MODIFY",
"old_path": ".github/CONTRIBUTING.md",
"new_path": ".github/CONTRIBUTING.md",
"diff": "@@ -15,16 +15,26 @@ If you report a bug, please provide steps to reproduce this bug and revision of\nIf you would like to contribute code to fix a bug, add a new feature, or\notherwise improve our project, pull requests are most welcome.\n-## Quick maintenance guide for nix :\n+## Quick maintenance guide\n+\n+- Tezos revision is located in the [`sources.json`](../nix/nix/sources.json) file.\n+ You can either update it manually to newer revision or use `niv` tool.\n+ In order to do that run `niv update tezos` (this will update revision to latest).\n+ `niv update tezos -a rev=...` will update wources to some commit.\n+- Used tezos protocols can be changed by [`proto`](../script/proto) script.\n+ This script requires `jq` and `moreutils` to be installed.\n+ Currently used protocols are displayed in [`protocols.json`](../protocols.json).\n+ - To add a new protocol, `./proto activate ...`.\n+ - To stop building protocol-specific binaries for a protocol, but keep supporting it in\n+ multi-protocol binaries, `./proto allow`.\n+ - To deprecate a protocol, `./proto ignore ...`.\n+\n+### Nix specific maintenance\nAll nix related files are located in the [nix](./nix) directory.\n-- To update Tezos's revision to latest, `niv update tezos`\n-- To update to some commit, `niv update tezos -a rev=...`\n-- To add a new protocol after updating, `./proto activate ...`\n-- To stop building protocol-specific binaries for a protocol, but keep supporting it in multi-protocol binaries, `./proto allow ...`\n-- To deprecate a protocol, `./proto ignore ...`\n-- If the build breaks because of a dependency issue, `nix repl pkgs.nix` can be very useful to investigate it\n+If the build breaks because of a dependency issue, `nix repl pkgs.nix`\n+can be very useful to investigate it.\n## Legal\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/Dockerfile",
"new_path": "docker/package/Dockerfile",
"diff": "@@ -11,7 +11,7 @@ RUN useradd dockerbuilder && mkdir /tezos-packaging\nENV HOME /tezos-packaging\nCOPY meta.json /tezos-packaging/meta.json\nCOPY nix/nix/sources.json /tezos-packaging/nix/nix/sources.json\n-COPY nix/protocols.json /tezos-packaging/nix/protocols.json\n+COPY protocols.json /tezos-packaging/protocols.json\nWORKDIR /tezos-packaging/docker\nENV OPAMROOT \"/tezos-packaging/docker/opamroot\"\nRUN opam init --bare --yes --disable-sandboxing\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/package/package_generator.py",
"new_path": "docker/package/package_generator.py",
"diff": "@@ -29,7 +29,7 @@ tezos_sources = json.load(open(\"../nix/nix/sources.json\", \"r\"))[\"tezos\"]\ncommon_deps = [\"libev-dev\", \"libgmp-dev\", \"libhidapi-dev\", \"m4\", \"perl\", \"pkg-config\",\n\"wget\", \"unzip\", \"rsync\"]\n-active_protocols = json.load(open(\"../nix/protocols.json\", \"r\"))[\"active\"]\n+active_protocols = json.load(open(\"../protocols.json\", \"r\"))[\"active\"]\nversion = f\"{tezos_sources['ref'][1:]}\"\nrelease = f\"{meta['release']}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/build/ocaml-overlay.nix",
"new_path": "nix/build/ocaml-overlay.nix",
"diff": "# SPDX-License-Identifier: MPL-2.0\n{ sources ? import ./nix/sources.nix\n-, protocols ? builtins.fromJSON (builtins.readFile ../protocols.json)\n+, protocols ? builtins.fromJSON (builtins.readFile ../../protocols.json)\n, hacks ? import ./hacks.nix\n, pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }:\nself: super: {\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/protocols.nix",
"new_path": "nix/protocols.nix",
"diff": "#\n# SPDX-License-Identifier: MPL-2.0\n-builtins.fromJSON (builtins.readFile ./protocols.json)\n+builtins.fromJSON (builtins.readFile ../protocols.json)\n"
},
{
"change_type": "RENAME",
"old_path": "nix/protocols.json",
"new_path": "protocols.json",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "nix/proto",
"new_path": "scripts/proto",
"diff": "-#!/usr/bin/env nix-shell\n-#!nix-shell -p jq moreutils -i bash\n+#!/usr/bin/env bash\n# SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>\n#\n# SPDX-License-Identifier: MPL-2.0\nedit(){\n- cat protocols.json | jq \"$@\" | sponge protocols.json\n+ cat ../protocols.json | jq \"$@\" | sponge ../protocols.json\n}\nadd(){\n@@ -29,5 +28,5 @@ case $command in\nallow) removeAll $1; add allowed $1;;\nignore) removeAll $1; add ignored $1;;\nforget) removeAll $1;;\n- *) jq . protocols.json\n+ *) jq . ../protocols.json\nesac\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#56] Move protocols.json from nix/
Problem: Now we use information about active protocols in both nix and
nix-less parts of our code, so it doesn't make much sense to store it in
nix/ directory anymore.
Solution: Move protocols.json to the repository root.
|
603,653
|
28.07.2020 00:01:45
| -10,800
|
e340d2a0ce03c9e16f7b761744eba1caf417d04f
|
Update tezos version to 7.3
Problem: a new tezos version is released. We want
to keep up with upstream updates.
Solution: update revision of tezos to the v7.3 tag.
|
[
{
"change_type": "MODIFY",
"old_path": "docker/build/Dockerfile",
"new_path": "docker/build/Dockerfile",
"diff": "@@ -13,7 +13,7 @@ RUN git clone --single-branch --branch hidapi-0.9.0 https://github.com/libusb/hi\nRUN cd hidapi && autoreconf -fvi && ./bootstrap && ./configure && make && make install\nRUN rm -rf libusb hidapi\nCOPY ./build/static_libs.patch /static.patch\n-RUN git clone --single-branch --branch v7.2 https://gitlab.com/tezos/tezos.git --depth 1\n+RUN git clone --single-branch --branch v7.3 https://gitlab.com/tezos/tezos.git --depth 1\nWORKDIR /tezos\nRUN git apply ../static.patch\nRUN export OPAMYES=\"true\" && opam init --bare --disable-sandboxing && make build-deps\n"
},
{
"change_type": "MODIFY",
"old_path": "nix/nix/sources.json",
"new_path": "nix/nix/sources.json",
"diff": "\"url_template\": \"https://github.com/<owner>/<repo>/archive/<rev>.tar.gz\"\n},\n\"tezos\": {\n- \"ref\": \"v7.2\",\n+ \"ref\": \"v7.3\",\n\"repo\": \"https://gitlab.com/tezos/tezos\",\n- \"rev\": \"6b9f3bc3c90d99d4a2bd5cd26e6f3efbcb977090\",\n+ \"rev\": \"ba45727cadd0416936fbd49400bcc986a55064ca\",\n\"type\": \"git\"\n}\n}\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#26] Update tezos version to 7.3
Problem: a new tezos version is released. We want
to keep up with upstream updates.
Solution: update revision of tezos to the v7.3 tag.
|
603,652
|
03.08.2020 10:08:45
| -10,800
|
b24888765614c156f77f45b22c60ee1443bad4ac
|
Add systemd unit for tezos-node and daemons
Since we want to include systemd units to our packages, we should define
them for all required binaries.
This commit defines these units in 'systemd/tezos-*.service',
their default configs in 'defaults/tezos-*.conf' and startup scripts
for these binaries in 'scripts/tezos-*-start'.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/defaults/tezos-accuser.conf",
"diff": "+# vim: ft=sh\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# shellcheck disable=SC2034\n+NODE_HOST=\"localhost\"\n+NODE_RPC_PORT=\"8732\"\n+DATA_DIR=\"/var/lib/tezos/accuser\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/defaults/tezos-baker.conf",
"diff": "+# vim: ft=sh\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# shellcheck disable=SC2034\n+DATA_DIR=\"/var/lib/tezos/baker\"\n+NODE_RPC_PORT=\"8732\"\n+BAKER_ACCOUNT=\"\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/defaults/tezos-endorser.conf",
"diff": "+# vim: ft=sh\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# shellcheck disable=SC2034\n+NODE_HOST=\"localhost\"\n+NODE_RPC_PORT=\"8732\"\n+DATA_DIR=\"/var/lib/tezos/endorser\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/defaults/tezos-node.conf",
"diff": "+# vim: ft=sh\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+# shellcheck disable=SC2034\n+NODE_RPC_PORT=\"8732\"\n+NETWORK=\"carthagenet\"\n+CERT_PATH=\"\"\n+KEY_PATH=\"\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-accuser-start",
"diff": "+#!/usr/bin/bash\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+set -euo pipefail\n+\n+# $PROTOCOL should be defined in the system unit environment\n+accuser=\"/usr/bin/tezos-accuser-$PROTOCOL\"\n+\n+accuser_dir=\"$DATA_DIR\"\n+\n+accuser_config=\"$accuser_dir/config\"\n+mkdir -p \"$accuser_dir\"\n+\n+if [ ! -f \"$accuser_config\" ]; then\n+ \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ config init --output \"$accuser_config\" >/dev/null 2>&1\n+else\n+ \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ config update >/dev/null 2>&1\n+fi\n+\n+exec \"$accuser\" --base-dir \"$accuser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ run \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-baker-start",
"diff": "+#!/usr/bin/bash\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+set -euo pipefail\n+\n+# $PROTOCOL should be defined in the system unit environment\n+baker=\"/usr/bin/tezos-baker-$PROTOCOL\"\n+\n+baker_dir=\"$DATA_DIR\"\n+node_data_dir=\"/var/lib/tezos/node/data\"\n+\n+baker_config=\"$baker_dir/config\"\n+mkdir -p \"$baker_dir\"\n+\n+if [ ! -f \"$baker_config\" ]; then\n+ \"$baker\" --base-dir \"$baker_dir\" \\\n+ --port \"$NODE_RPC_PORT\" \\\n+ config init --output \"$baker_config\" >/dev/null 2>&1\n+else\n+ \"$baker\" --base-dir \"$baker_dir\" \\\n+ --port \"$NODE_RPC_PORT\" \\\n+ config update >/dev/null 2>&1\n+fi\n+\n+launch_baker() {\n+ exec \"$baker\" \\\n+ --base-dir \"$baker_dir\" --port \"$NODE_RPC_PORT\" \\\n+ run with local node \"$node_data_dir\" \"$@\"\n+}\n+\n+if [[ -z \"$BAKER_ACCOUNT\" ]]; then\n+ launch_baker \"$@\"\n+else\n+ launch_baker \"$BAKER_ACCOUNT\" \"$@\"\n+fi\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-endorser-start",
"diff": "+#!/usr/bin/bash\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+set -euo pipefail\n+\n+# $PROTOCOL should be defined in the system unit environment\n+endorser=\"/usr/bin/tezos-endorser-$PROTOCOL\"\n+\n+endorser_dir=\"$DATA_DIR/endorser\"\n+\n+endorser_config=\"$endorser_dir/config\"\n+mkdir -p \"$endorser_dir\"\n+\n+if [ ! -f \"$endorser_config\" ]; then\n+ \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ config init --output \"$endorser_config\" >/dev/null 2>&1\n+else\n+ \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ config update >/dev/null 2>&1\n+fi\n+\n+exec \"$endorser\" --base-dir \"$endorser_dir\" \\\n+ --addr \"$NODE_HOST\" --port \"$NODE_RPC_PORT\" \\\n+ run \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/scripts/tezos-node-start",
"diff": "+#!/usr/bin/bash\n+\n+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+set -euo pipefail\n+\n+: \"${BIN_DIR:=\"/usr/bin\"}\"\n+: \"${DATA_DIR:=\"/var/lib/tezos\"}\"\n+\n+node=\"$BIN_DIR/tezos-node\"\n+node_dir=\"$DATA_DIR/node\"\n+node_data_dir=\"$node_dir/data\"\n+\n+mkdir -p \"$node_data_dir\"\n+if [ ! -f \"$node_data_dir/config.json\" ]; then\n+ echo \"Configuring the node...\"\n+ \"$node\" config init \\\n+ --data-dir \"$node_data_dir\" \\\n+ --rpc-addr \":$NODE_RPC_PORT\" \\\n+ --network \"$NETWORK\"\n+ \"$@\"\n+else\n+ echo \"Updating the node configuration...\"\n+ \"$node\" config update \\\n+ --data-dir \"$node_data_dir\" \\\n+ --rpc-addr \":$NODE_RPC_PORT\" \\\n+ --network \"$NETWORK\"\n+ \"$@\"\n+fi\n+# Generate a new identity if not present\n+\n+if [ ! -f \"$node_data_dir/identity.json\" ]; then\n+ echo \"Generating a new node identity...\"\n+ \"$node\" identity generate \"${IDENTITY_POW:-26}\". \\\n+ --data-dir \"$node_data_dir\"\n+fi\n+\n+# Launching the node\n+\n+if [[ -z \"$CERT_PATH\" || -z \"$KEY_PATH\" ]]; then\n+ exec \"$node\" run --data-dir \"$node_data_dir\"\n+else\n+ exec \"$node\" run --data-dir \"$node_data_dir\" --rpc-tls=\"$CERT_PATH\",\"$KEY_PATH\"\n+fi\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/systemd/tezos-accuser.service",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+[Unit]\n+After=network.target\n+Description=Tezos accuser\n+\n+[Service]\n+EnvironmentFile=/etc/default/tezos-accuser-006-pscartha\n+Environment=\"PROTOCOL=006-PsCARTHA\"\n+ExecStart=/usr/bin/tezos-accuser-start\n+StateDirectory=tezos\n+User=tezos\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/systemd/tezos-baker.service",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+[Unit]\n+After=network.target\n+After=tezos-node.service\n+Requires=tezos-node.service\n+Description=Tezos baker\n+\n+[Service]\n+EnvironmentFile=/etc/default/tezos-baker-006-pscartha\n+Environment=\"PROTOCOL=006-PsCARTHA\"\n+ExecStart=/usr/bin/tezos-baker-start\n+StateDirectory=tezos\n+User=tezos\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/systemd/tezos-endorser.service",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+[Unit]\n+After=network.target\n+Description=Tezos endorser\n+\n+[Service]\n+EnvironmentFile=/etc/default/tezos-endorser-006-pscartha\n+Environment=\"PROTOCOL=006-PsCARTHA\"\n+ExecStart=/usr/bin/tezos-endorser-start\n+StateDirectory=tezos\n+User=tezos\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/package/systemd/tezos-node.service",
"diff": "+# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>\n+#\n+# SPDX-License-Identifier: MPL-2.0\n+\n+[Unit]\n+After=network.target\n+Description=Tezos node\n+\n+[Service]\n+EnvironmentFile=/etc/default/tezos-node\n+ExecStart=/usr/bin/tezos-node-start\n+StateDirectory=tezos\n+User=tezos\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
Add systemd unit for tezos-node and daemons
Since we want to include systemd units to our packages, we should define
them for all required binaries.
This commit defines these units in 'systemd/tezos-*.service',
their default configs in 'defaults/tezos-*.conf' and startup scripts
for these binaries in 'scripts/tezos-*-start'.
|
603,652
|
03.08.2020 10:24:26
| -10,800
|
6626260f2664d03b427da9f7212684b8d9dda9b6
|
Update protocol version in README
Problem: 005-PsBabyM1 is already dead for quite a long time and we don't
update packages for it, however, it's mentioned in the readme.
Solution: Mention 006-PsCARTHA in README instead.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -32,7 +32,7 @@ sudo add-apt-repository ppa:serokell/tezos && sudo apt-get update\nsudo apt-get install tezos-client\n# dpkg-source prohibits uppercase in the packages names so the protocol\n# name is in lowercase\n-sudo apt-get install tezos-baker-005-psbabym1\n+sudo apt-get install tezos-baker-006-pscartha\n```\nOnce you install such packages the commands `tezos-*` will be available.\n@@ -45,11 +45,11 @@ E.g. in order to install `tezos-client` or `tezos-baker` run the following comma\n# use dnf\nsudo dnf copr enable @Serokell/Tezos\nsudo dnf install tezos-client\n-sudo dnf install tezos-baker-005-PsBabyM1\n+sudo dnf install tezos-baker-006-PsCARTHA\n# or use yum\nsudo yum copr enable @Serokell/Tezos\n-sudo yum install tezos-baker-005-PsBabyM1\n+sudo yum install tezos-baker-006-PsCARTHA\n```\nOnce you install such packages the commands `tezos-*` will be available.\n"
}
] |
Python
|
MIT License
|
serokell/tezos-packaging
|
[#68] Update protocol version in README
Problem: 005-PsBabyM1 is already dead for quite a long time and we don't
update packages for it, however, it's mentioned in the readme.
Solution: Mention 006-PsCARTHA in README instead.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.