[REM] hooks

En el nuevo approach la idea es que no vamos a hacer imagenes base, enterprise y community.
Esta imagen genera imagen para tener odoo pero sin odoo

Dockerfile

@@ -5,16 +5,14 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 
 ARG GITHUB_USER
 ARG GITHUB_TOKEN
-ARG GITLAB_USER
+ARG GITHUB_BOT_TOKEN
 ARG GITLAB_TOKEN
 ARG DOCKER_IMAGE
-ARG DOCKER_TAG_SUFFIX
 ARG SAAS_PROVIDER_URL
 ARG SAAS_PROVIDER_TOKEN
 ENV GITHUB_USER="$GITHUB_USER"
 ENV GITHUB_TOKEN="$GITHUB_TOKEN"
-ENV GITLAB_USER="$GITLAB_USER"
-ENV GITLAB_TOKEN="$GITLAB_TOKEN"
+ENV GITHUB_BOT_TOKEN="$GITHUB_BOT_TOKEN"
 
 # Default env values used by config generator
 # TODO remove after no more customers on v13 and also remove them on 90-saas-client.conf
@@ -60,7 +58,7 @@ COPY conf.d/* $RESOURCES/conf.d/
 COPY resources/$ODOO_VERSION/* $RESOURCES/
 
 ENV BASE_URL="${SAAS_PROVIDER_URL}/odoo_project"
-ENV URL_SUFIX="?docker_image=${DOCKER_IMAGE}&major_version=${ODOO_VERSION}&suffix=${DOCKER_TAG_SUFFIX}&token=${SAAS_PROVIDER_TOKEN}"
+ENV URL_SUFIX="?docker_image=${DOCKER_IMAGE}&major_version=${ODOO_VERSION}&token=${SAAS_PROVIDER_TOKEN}"
 
 # get repos from odoo-version-group and odoo-version
 RUN wget -O $RESOURCES/saas-odoo_project_repos.yml $BASE_URL/repos.yml$URL_SUFIX

hooks/build

@@ -3,40 +3,16 @@ set -ex
 
 DOCKER_IMAGE=${DOCKER_REPO/#index.docker.io\/}
 
-if [ ! -z "$BUILD_TAG_COMMUNITY" ]; then
-    docker image build \
-        --build-arg VCS_REF="$GIT_SHA1" \
-        --build-arg BUILD_DATE="$(date --rfc-3339 ns)" \
-        --build-arg DOCKER_IMAGE="$DOCKER_IMAGE" \
-        --build-arg BASE_IMAGE_REPO="$BASE_IMAGE_REPO" \
-        --build-arg BASE_IMAGE_TAG="$DOCKER_TAG" \
-        --build-arg SAAS_PROVIDER_URL="$SAAS_PROVIDER_URL" \
-        --build-arg SAAS_PROVIDER_TOKEN="$SAAS_PROVIDER_TOKEN" \
-        --build-arg GITHUB_USER="$GITHUB_USER" \
-        --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" \
-        --build-arg GITLAB_USER="$GITLAB_USER" \
-        --build-arg GITLAB_TOKEN="$GITLAB_TOKEN" \
-        --tag "$DOCKER_REPO:$DOCKER_TAG" \
-        .
-fi
-
-if [ ! -z "$BUILD_TAG_ENTERPRISE" ]; then
-
-    DOCKER_TAG_SUFFIX=enterprise
-
-    docker image build \
-        --build-arg VCS_REF="$GIT_SHA1" \
-        --build-arg BUILD_DATE="$(date --rfc-3339 ns)" \
-        --build-arg DOCKER_IMAGE="$DOCKER_IMAGE" \
-        --build-arg DOCKER_TAG_SUFFIX="$DOCKER_TAG_SUFFIX" \
-        --build-arg BASE_IMAGE_REPO="$BASE_IMAGE_REPO" \
-        --build-arg BASE_IMAGE_TAG="$DOCKER_TAG-$DOCKER_TAG_SUFFIX" \
-        --build-arg SAAS_PROVIDER_URL="$SAAS_PROVIDER_URL" \
-        --build-arg SAAS_PROVIDER_TOKEN="$SAAS_PROVIDER_TOKEN" \
-        --build-arg GITHUB_USER="$GITHUB_USER" \
-        --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" \
-        --build-arg GITLAB_USER="$GITLAB_USER" \
-        --build-arg GITLAB_TOKEN="$GITLAB_TOKEN" \
-        --tag "$DOCKER_REPO:$DOCKER_TAG-$DOCKER_TAG_SUFFIX" \
-        .
-fi
+docker image build \
+    --build-arg VCS_REF="$GIT_SHA1" \
+    --build-arg BUILD_DATE="$(date --rfc-3339 ns)" \
+    --build-arg DOCKER_IMAGE="$DOCKER_IMAGE" \
+    --build-arg BASE_IMAGE_REPO="$BASE_IMAGE_REPO" \
+    --build-arg BASE_IMAGE_TAG="$DOCKER_TAG" \
+    --build-arg SAAS_PROVIDER_URL="$SAAS_PROVIDER_URL" \
+    --build-arg SAAS_PROVIDER_TOKEN="$SAAS_PROVIDER_TOKEN" \
+    --build-arg GITHUB_USER="$GITHUB_USER" \
+    --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" \
+    --build-arg GITHUB_BOT_TOKEN="$GITHUB_BOT_TOKEN" \
+    --tag "$DOCKER_REPO:$DOCKER_TAG" \
+    .

hooks/post_push

@@ -1,20 +1,12 @@
 #!/bin/bash
 set -ex
 
-# Version control tags
 # We append BUILD_DATE to the image tag.
 
 BUILD_DATE=`date -u +%Y.%m.%d`
 
 TAG="$DOCKER_REPO:$DOCKER_TAG"
 NEWTAG="$TAG.$BUILD_DATE"
 
-if [ ! -z "$BUILD_TAG_COMMUNITY" ]; then
-    docker tag "$TAG" "$NEWTAG"
-    docker push "$NEWTAG"
-fi
-
-if [ ! -z "$BUILD_TAG_ENTERPRISE" ]; then
-    docker tag "$TAG-enterprise" "$NEWTAG-enterprise"
-    docker push "$NEWTAG-enterprise"
-fi
+docker tag "$TAG" "$NEWTAG"
+docker push "$NEWTAG"

hooks/push

@@ -1,10 +1,4 @@
 #!/bin/bash
 set -ex
 
-if [ ! -z "$BUILD_TAG_COMMUNITY" ]; then
-    docker push "$DOCKER_REPO:$DOCKER_TAG"
-fi
-
-if [ ! -z "$BUILD_TAG_ENTERPRISE" ]; then
-    docker push "$DOCKER_REPO:$DOCKER_TAG-enterprise"
-fi
+docker push "$DOCKER_REPO:$DOCKER_TAG"