~ forgetting about using sha to select the FROM image for Signal as it's redacted by github actions

- doc cleanup
This commit is contained in:
nicobo 2021-04-04 22:40:04 +02:00
parent df0f72541a
commit 354ee8a183
No known key found for this signature in database
GPG key ID: 2581E71C5FA5285F

View file

@ -14,6 +14,10 @@ on:
jobs:
##############
# JOB - build-publish-alpine
#
build-publish-alpine:
name: Build, Publish alpine
environment: prod
@ -36,9 +40,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -c constraints.txt -r requirements-build.txt
# Stores a variable for each variant
echo DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
echo SIGNAL_DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant signal-debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
# Stores a variable for each variant as needed
echo ALPINE_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant alpine --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
# Also stores the computed version
echo NICOBOT_VERSION=$(python3 setup.py --version) >> $GITHUB_ENV
@ -97,13 +99,17 @@ jobs:
run: echo ${{ steps.docker_build_alpine.outputs.digest }}
##############
# JOB - build-publish-debian
#
build-publish-debian:
name: Build, Publish debian
environment: prod
runs-on: ubuntu-latest
outputs:
digest: ${{ steps.docker_build_debian.outputs.digest }}
# FIXME Does not work because GA thinks it's secret stuff
#outputs:
# digest: ${{ steps.docker_build_debian.outputs.digest }}
steps:
- name: Checkout
@ -122,10 +128,8 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -c constraints.txt -r requirements-build.txt
# Stores a variable for each variant
# Stores a variable for each variant as needed
echo DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
echo SIGNAL_DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant signal-debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
echo ALPINE_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant alpine --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
# Also stores the computed version
echo NICOBOT_VERSION=$(python3 setup.py --version) >> $GITHUB_ENV
@ -184,6 +188,10 @@ jobs:
##############
# JOB - build-publish-signaldebian
#
build-publish-signaldebian:
name: Build, Publish signal-debian
needs:
@ -208,10 +216,10 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -c constraints.txt -r requirements-build.txt
# Stores a variable for each variant
# Stores a variable for each variant as needed
echo DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
echo NICOBOT_DEBIAN_FROM=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant debian --ref ${{ github.ref }} --sep '\n' | head -1) >> $GITHUB_ENV
echo SIGNAL_DEBIAN_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant signal-debian --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
echo ALPINE_TAGS=$(python3 setup.py -q docker_tags --image nicolabs/nicobot --variant alpine --ref ${{ github.ref }} --sep ,) >> $GITHUB_ENV
# Also stores the computed version
echo NICOBOT_VERSION=$(python3 setup.py --version) >> $GITHUB_ENV
@ -255,7 +263,7 @@ jobs:
context: ./
file: ./signal-debian.Dockerfile
build-args: |
NICOBOT_DEBIAN_FROM=nicolabs/nicobot@${{ needs.build-publish-debian.outputs.digest }}
NICOBOT_DEBIAN_FROM=nicolabs/nicobot:${{ env.NICOBOT_DEBIAN_FROM }}
builder: ${{ steps.buildx.outputs.name }}
platforms: linux/arm/v7,linux/arm64,linux/386,linux/amd64
push: true