Merge pull request #71 from itpp-labs/DINAR2fork

DINAR2fork
itpp-labs · May 22, 2022 · 798b323 · 798b323
2 parents f80bd93 + 90bb807
commit 798b323
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/embedded-files/.DINAR/Dockerfile b/embedded-files/.DINAR/Dockerfile
@@ -1,2 +1,2 @@
 ARG ODOO_VERSION
-FROM ghcr.io/itpp-labs/doodba/doodba:${ODOO_VERSION}-onbuild
+FROM ghcr.io/itpp-labs/doodba:${ODOO_VERSION}-onbuild
diff --git a/workflow-files/configure-docker.sh b/workflow-files/configure-docker.sh
@@ -4,9 +4,8 @@ DIR="`dirname \"$0\"`"
 REF=${GITHUB_BASE_REF:-${GITHUB_REF}}
 BRANCH=${REF##*/}
 REPO_NAME=${GITHUB_REPOSITORY##*/}
-IMAGE_CODE=$REPO_NAME:$BRANCH
-IMAGE_DB=${GITHUB_REPOSITORY}/dinar-db-$IMAGE_CODE
-IMAGE_ODOO=${GITHUB_REPOSITORY}/dinar-odoo-$IMAGE_CODE
+IMAGE_DB=${GITHUB_REPOSITORY_OWNER}/dinar:$REPO_NAME-db-$BRANCH
+IMAGE_ODOO=${GITHUB_REPOSITORY_OWNER}/dinar:$REPO_NAME-odoo-$BRANCH
 IMAGE_ODOO_BASE=$IMAGE_ODOO-base
 REGISTRY=ghcr.io
 REGISTRY_USERNAME="${GITHUB_ACTOR}"
@@ -17,7 +16,6 @@ echo "ODOO_VERSION=$ODOO_VERSION"
 
 echo "DB_VERSION=10" >> $GITHUB_ENV
 echo "ODOO_VERSION=$ODOO_VERSION" >> $GITHUB_ENV
-echo "IMAGE_CODE=$IMAGE_CODE" >> $GITHUB_ENV
 echo "IMAGE_DB=$IMAGE_DB" >> $GITHUB_ENV
 echo "IMAGE_ODOO=$IMAGE_ODOO" >> $GITHUB_ENV
 echo "IMAGE_ODOO_BASE=$IMAGE_ODOO_BASE" >> $GITHUB_ENV