Sheldan/OnePlusBot
1
0
Fork 0
mirror of https://github.com/Sheldan/OnePlusBot.git synced 2026-04-06 09:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPB-3] using arguments for deployment docker image build, in order to access the abstracto registry

Browse Source
This commit is contained in:
Sheldan
2021-03-23 12:38:37 +01:00
parent 070893fe6a
commit 6818e390be
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/release.yml vendored
View File

@@ -16,6 +16,9 @@ jobs:
- name: Load current version - name: Load current version
id: version id: version
run: echo "version=$(mvn --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV 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 - name: Publish to GitHub Packages
run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
env: env:
@@ -33,4 +36,6 @@ jobs:
run: docker-compose build && docker-compose push run: docker-compose build && docker-compose push
env: env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/ REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
VERSION: ${{ env.version }} VERSION: ${{ env.version }}
ABSTRACTO_VERSION: ${{ env.abstracto_version }}
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

4
deployment/image-packaging/src/main/docker/deployment/Dockerfile
View File

@@ -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 MAINTAINER Sheldan
ADD template-artifacts /templates ADD template-artifacts /templates
ADD translation-artifacts /translations ADD translation-artifacts /translations

6
deployment/image-packaging/src/main/docker/docker-compose.yml
View File

@@ -11,7 +11,11 @@ services:
build: pgAdmin build: pgAdmin
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest} image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
deployment_container: 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} image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
prometheus: prometheus:
build: prometheus build: prometheus