From 6229cae48453ca47553fa4a8a2291a4042c6ebf9 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <iel@odoo.com>
Date: Sun, 22 May 2022 19:21:45 +0200
Subject: [PATCH] fix image names

---
 embedded-files/.DINAR/Dockerfile   | 2 +-
 workflow-files/configure-docker.sh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/embedded-files/.DINAR/Dockerfile b/embedded-files/.DINAR/Dockerfile
index cf7834b..7629ef5 100644
--- 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
index f78db74..acbafdd 100644
--- 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