diff --git a/.woodpecker.yml b/.woodpecker.yml index f3e842f..ecef04d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,28 +8,32 @@ steps: image: python:3.11-slim commands: - pip install pyyaml jinja2 - - python build.py -cfg amar + - python build.py dev --cfg amar - ls -la gen/ # Build Docker image from generated code build: image: docker:24-dind commands: + - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin registry.mcrn.ar - cd gen - - docker build -t registry.mcrn.ar/soleprint:${CI_COMMIT_SHA::7} . - - docker tag registry.mcrn.ar/soleprint:${CI_COMMIT_SHA::7} registry.mcrn.ar/soleprint:latest + - docker build -t registry.mcrn.ar/soleprint:${CI_COMMIT_SHA:0:7} . + - docker tag registry.mcrn.ar/soleprint:${CI_COMMIT_SHA:0:7} registry.mcrn.ar/soleprint:latest + secrets: [registry_user, registry_password] volumes: - /var/run/docker.sock:/var/run/docker.sock when: event: push branch: main - # Push to private registry + # Push to registry push: image: docker:24-dind commands: - - docker push registry.mcrn.ar/soleprint:${CI_COMMIT_SHA::7} + - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin registry.mcrn.ar + - docker push registry.mcrn.ar/soleprint:${CI_COMMIT_SHA:0:7} - docker push registry.mcrn.ar/soleprint:latest + secrets: [registry_user, registry_password] volumes: - /var/run/docker.sock:/var/run/docker.sock when: @@ -45,6 +49,7 @@ steps: key: from_secret: deploy_key script: + - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin registry.mcrn.ar - docker network create mainroom_default 2>/dev/null || true - cd ~/soleprint && git pull origin main - cd ~/soleprint/gen @@ -56,6 +61,7 @@ steps: - docker pull registry.mcrn.ar/soleprint:latest - docker compose down || true - docker compose up -d + envs_from_secrets: [registry_user, registry_password] when: event: push branch: main diff --git a/artery/index.html b/artery/index.html index faaf216..e57e61c 100644 --- a/artery/index.html +++ b/artery/index.html @@ -432,8 +432,7 @@ if vein.status="" ="planned" - %} - data-disabled="true" + %}data-disabled="true" {% endif %}