Skip to content
Snippets Groups Projects
Commit 5a8c4e99 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

fix(#122): only use multiplatform docker release

parent 602ba9bd
No related branches found
No related tags found
No related merge requests found
Pipeline #34205 waiting for manual action
Stage: labels
Stage: quality
Stage: tests
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 31
− 82
View file @ 5a8c4e99
...@@ -64,80 +64,6 @@ fmt_and_clippy: ...@@ -64,80 +64,6 @@ fmt_and_clippy:
- cargo clippy -- -V - cargo clippy -- -V
- cargo clippy --all --tests -- -D warnings - cargo clippy --all --tests -- -D warnings
.docker_release_build:
stage: build
rules:
- if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
when: manual
changes:
- node/specs/$CHAIN-raw.json
variables:
IMAGE_NAME: "duniter/duniter-v2s-$CHAIN"
IMAGE_TAG: "latest"
PODMAN_BUILD_OPTIONS: "--platform linux/amd64 --build-arg chain=$CHAIN"
script:
- echo podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
- podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
tags:
- podman
.docker_release_deploy:
stage: deploy
rules:
- if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
when: manual
changes:
- node/specs/$CHAIN-raw.json
variables:
IMAGE_NAME: "duniter/duniter-v2s-$CHAIN"
IMAGE_TAG: "latest"
script:
- echo podman push "localhost/$IMAGE_NAME:$IMAGE_TAG" "docker://docker.io/$IMAGE_NAME:$IMAGE_TAG"
- podman podman push "localhost/$IMAGE_NAME:$IMAGE_TAG" "docker://docker.io/$IMAGE_NAME:$IMAGE_TAG"
tags:
- podman
gdev_docker_release_build:
extends: .docker_release_build
variables:
CHAIN: gdev
gtest_docker_release_build:
extends: .docker_release_build
variables:
CHAIN: gtest
gdev_docker_release_deploy:
extends: .docker_release_deploy
needs: ['gdev_docker_release_build']
variables:
CHAIN: gdev
gtest_docker_release_deploy:
extends: .docker_release_deploy
needs: ['gtest_docker_release_build']
variables:
CHAIN: gtest
.docker_deploy:
stage: deploy
before_script:
- sh -c "[ -n '$DUNITERTEAM_PASSWD' ] || ( echo No access to environment variable 'DUNITERTEAM_PASSWD'; exit 1 )"
- podman login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" docker.io
tags:
- podman
.docker_deploy_multiplatform:
extends: .docker_deploy
script:
- podman manifest rm "$MANIFEST" 2>/dev/null || true
- podman build --layers --platform linux/amd64,linux/arm64 --manifest "$MANIFEST" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
- podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$IMAGE_TAG"
after_script:
- podman manifest rm "$MANIFEST"
variables:
MANIFEST: "localhost/manifest-$IMAGE_NAME:$IMAGE_TAG"
tests: tests:
stage: tests stage: tests
image: rust:1-bullseye image: rust:1-bullseye
...@@ -161,23 +87,46 @@ tests: ...@@ -161,23 +87,46 @@ tests:
- cargo tu - cargo tu
- cargo cucumber - cargo cucumber
deploy_docker_release_tag_multiplatform: .deploy_docker_multiplatform:
stage: deploy stage: deploy
needs: ["deploy_docker_release_tag"]
extends: .docker_deploy_multiplatform
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
when: manual
#changes:
# - node/specs/$CHAIN-raw.json
- when: never - when: never
before_script:
- sh -c "[ -n '$DUNITERTEAM_PASSWD' ] || ( echo No access to environment variable 'DUNITERTEAM_PASSWD'; exit 1 )"
- podman login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" docker.io
script: script:
- !reference [.docker_deploy_multiplatform, script] - export MILESTONE=$(echo $CI_COMMIT_BRANCH | sed -e "s/release\///g")
- echo $MILESTONE
- export MANIFEST=localhost/manifest-$IMAGE_NAME:$MILESTONE
- echo $MANIFEST
- podman manifest rm "$MANIFEST" 2>/dev/null || true
- podman build --layers --platform linux/amd64 --manifest "$MANIFEST" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
- podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$MILESTONE"
- podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest" - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest"
after_script:
- podman manifest rm "$MANIFEST"
variables: variables:
IMAGE_NAME: "duniter/duniter-v2s" IMAGE_NAME: "duniter/duniter-v2s-$CHAIN"
IMAGE_TAG: "$CI_COMMIT_TAG" PODMAN_BUILD_OPTIONS: "--build-arg chain=$CHAIN"
tags:
- podman
gdev_docker_deploy:
extends: .deploy_docker_multiplatform
variables:
CHAIN: gdev
gtest_docker_deploy:
extends: .deploy_docker_multiplatform
variables:
CHAIN: gtest
readme_docker_release_tag: readme_docker_release_tag:
stage: deploy_readme stage: deploy_readme
needs: ["deploy_docker_release_tag"]
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/"
- when: never - when: never
......
docker/README.md
+ 15
− 15
View file @ 5a8c4e99
...@@ -11,7 +11,7 @@ version: "3.5" ...@@ -11,7 +11,7 @@ version: "3.5"
services: services:
duniter-mirror: duniter-mirror:
image: duniter/duniter-v2s:latest image: duniter/duniter-v2s-gdev:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
# Prometheus endpoint # Prometheus endpoint
...@@ -39,7 +39,7 @@ version: "3.5" ...@@ -39,7 +39,7 @@ version: "3.5"
services: services:
duniter-validator: duniter-validator:
image: duniter/duniter-v2s:latest image: duniter/duniter-v2s-gdev:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
# Prometheus endpoint # Prometheus endpoint
...@@ -60,7 +60,7 @@ volumes: ...@@ -60,7 +60,7 @@ volumes:
## Environment variables ## Environment variables
| Name | Description | Default | | Name | Description | Default |
| ---- | ----------- | ------- | |------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
| `DUNITER_NODE_NAME` | The node name. This name will appear on the Substrate telemetry server when telemetry is enabled. | Random name | | `DUNITER_NODE_NAME` | The node name. This name will appear on the Substrate telemetry server when telemetry is enabled. | Random name |
| `DUNITER_CHAIN_NAME` | The currency to process. "gdev" uses the embeded chainspec. A path allows to use a local json raw chainspec. | `dev` (development mode) | | `DUNITER_CHAIN_NAME` | The currency to process. "gdev" uses the embeded chainspec. A path allows to use a local json raw chainspec. | `dev` (development mode) |
| `DUNITER_PUBLIC_ADDR` | The libp2p public address base. See [libp2p documentation](https://docs.libp2p.io/concepts/fundamentals/addressing/). This variable is useful when the node is behind a reverse proxy with its ports not directly exposed.<br>Note: the `p2p/<peer_id>` part of the address shouldn't be set in this variable. It is automatically added by Duniter. | duniter-v2s guesses one from the node's IPv4 address. | | `DUNITER_PUBLIC_ADDR` | The libp2p public address base. See [libp2p documentation](https://docs.libp2p.io/concepts/fundamentals/addressing/). This variable is useful when the node is behind a reverse proxy with its ports not directly exposed.<br>Note: the `p2p/<peer_id>` part of the address shouldn't be set in this variable. It is automatically added by Duniter. | duniter-v2s guesses one from the node's IPv4 address. |
...@@ -93,6 +93,6 @@ docker compose up -d ...@@ -93,6 +93,6 @@ docker compose up -d
To run duniter from the command line without the default configuration detailed in the "Environment variables" section use `--` as the first argument. For example: To run duniter from the command line without the default configuration detailed in the "Environment variables" section use `--` as the first argument. For example:
``` ```
$ docker run --rm duniter/duniter-v2s:latest -- key generate $ docker run --rm duniter/duniter-v2s-gdev:latest -- key generate
$ docker run --rm duniter/duniter-v2s:latest -- --chain gdev ... $ docker run --rm duniter/duniter-v2s-gdev:latest -- --chain gdev ...
``` ```
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment