Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
`nix store prefetch-file --json --hash-type sha256 https://digitalasset.jfrog.io/artifactory/canton-enterprise/canton-enterprise-<version>.tar.gz | jq -r '.hash'` and
`nix store prefetch-file --json --hash-type sha256 https://www.canton.io/releases/canton-open-source-<version>.tar.gz | jq -r '.hash'`
4. Update the Canton version and hashes of the oss and enterprise versions in `nix/canton-sources.json`.
5. In case you have also made configuration changes to Canton in `simple-topology-canton.conf`, remember
5. Update the image hashes of the Canton images in `nix/canton-sources.json` by running:
`for img in base participant mediator sequencer; do echo " \"canton_${img}_image_sha256\": \"$(skopeo inspect docker://europe-docker.pkg.dev/da-images/public-all/docker/canton-$img:${CANTON_VERSION} --format '{{.Digest}}')\","; done`
6. In case you have also made configuration changes to Canton in `simple-topology-canton.conf`, remember
to also make the corresponding changes for our cluster deployments. It is recommended to test any configuration
changes on scratchnet first.
6. Update the OpenAPI definitions from step 1 by running `update-openapi.sh` in `token-standard/dependencies/canton-json-api-v2/openapi/`.
7. Cleanup the `openapi.patch` file.
7. Update the OpenAPI definitions from step 1 by running `update-openapi.sh` in `token-standard/dependencies/canton-json-api-v2/openapi/`.
8. Cleanup the `openapi.patch` file.
Check `token-standard/dependencies/canton-json-api-v2/openapi/CHANGES.md` and apply any changes manually if CI breaks due to
token standard CLI issues that look caused by bad OpenAPI definitions.

Expand Down
123 changes: 0 additions & 123 deletions cluster/images/canton-cometbft-sequencer/app.conf

This file was deleted.

2 changes: 0 additions & 2 deletions cluster/images/canton-cometbft-sequencer/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ target-driver := $(dir)/target/driver.jar
$(dir)/$(docker-build): $(target-driver)
$(dir)/$(docker-build): build_arg := --build-arg base_version=$(shell get-snapshot-version)

include cluster/images/canton-base-image-dep.mk

$(target-driver): ${COMETBFT_DRIVER}/driver.jar
cp $< $@

Expand Down
12 changes: 3 additions & 9 deletions cluster/images/canton-mediator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
# Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

ARG base_version
FROM canton:${base_version}
ARG canton_version
ARG image_sha256

ARG base_version
LABEL org.opencontainers.image.base.name="canton:${base_version}"

EXPOSE 5007
EXPOSE 10013

COPY app.conf /app/
FROM europe-docker.pkg.dev/da-images/public-all/docker/canton-mediator:${canton_version}@${image_sha256}
49 changes: 0 additions & 49 deletions cluster/images/canton-mediator/app.conf

This file was deleted.

5 changes: 1 addition & 4 deletions cluster/images/canton-mediator/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@

dir := $(call current_dir)

$(dir)/$(docker-build): $(dir)/app.conf
$(dir)/$(docker-build): build_arg := --build-arg base_version=$(shell get-snapshot-version)

include cluster/images/canton-base-image-dep.mk
$(dir)/$(docker-build): build_arg := --build-arg canton_version=${CANTON_VERSION} --build-arg image_sha256=${CANTON_MEDIATOR_IMAGE_SHA256}
17 changes: 3 additions & 14 deletions cluster/images/canton-participant/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
# Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

ARG base_version
FROM canton:${base_version}
ARG canton_version
ARG image_sha256

ARG base_version
LABEL org.opencontainers.image.base.name=canton:${base_version}

EXPOSE 5001
EXPOSE 5002
EXPOSE 7575
EXPOSE 10013

COPY app.conf /app/

HEALTHCHECK --start-period=10m \
CMD grpcurl -plaintext localhost:5061 grpc.health.v1.Health/Check || exit 1
FROM europe-docker.pkg.dev/da-images/public-all/docker/canton-participant:${canton_version}@${image_sha256}
Loading
Loading