diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8063178..2ba0270 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,9 @@ jobs: - name: Load current version id: version run: echo "version=$(mvn --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV + - name: Load abstracto version + id: abstracto_version + run: echo "abstracto_version=${mvn help:evaluate --file pom.xml -Dexpression=abstracto.version -q -DforceStdout}" >> $GITHUB_ENV - name: Publish to GitHub Packages run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true env: @@ -33,4 +36,6 @@ jobs: run: docker-compose build && docker-compose push env: REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/ - VERSION: ${{ env.version }} \ No newline at end of file + VERSION: ${{ env.version }} + ABSTRACTO_VERSION: ${{ env.abstracto_version }} + ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/deployment/Dockerfile b/deployment/image-packaging/src/main/docker/deployment/Dockerfile index eddc3be..b59ceea 100644 --- a/deployment/image-packaging/src/main/docker/deployment/Dockerfile +++ b/deployment/image-packaging/src/main/docker/deployment/Dockerfile @@ -1,4 +1,6 @@ -FROM docker.pkg.github.com/sheldan/abstracto/abstracto_deployment:latest +ARG ABSTRACTO_REGISTRY_PREFIX= +ARG ABSTRACTO_VERSION=latest +FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION} MAINTAINER Sheldan ADD template-artifacts /templates ADD translation-artifacts /translations diff --git a/deployment/image-packaging/src/main/docker/docker-compose.yml b/deployment/image-packaging/src/main/docker/docker-compose.yml index 4b96013..43d6342 100644 --- a/deployment/image-packaging/src/main/docker/docker-compose.yml +++ b/deployment/image-packaging/src/main/docker/docker-compose.yml @@ -11,7 +11,11 @@ services: build: pgAdmin image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest} deployment_container: - build: deployment + build: + context: deployment + args: + ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX} + ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest} prometheus: build: prometheus