From be73b740e9ae16586d0bc7bc858554f527025c47 Mon Sep 17 00:00:00 2001 From: Jonatan Vicente Date: Tue, 30 Jan 2024 14:34:25 +0100 Subject: [PATCH] Some config changes --- Dockerfile | 6 +++ build_Docker.sh | 46 ++++++++++++++++++ conf/.env.dev | Bin 0 -> 105 bytes conf/.gitattributes | 3 ++ docker/Dockerfile | 0 docker/nginx_conf/nginx.conf | Bin 3347 -> 0 bytes .../nginx_conf => nginx_conf}/.gitattributes | 0 nginx_conf/nginx.conf | Bin 0 -> 3347 bytes .../nginx.conf.default | Bin 9 files changed, 55 insertions(+) create mode 100644 Dockerfile create mode 100755 build_Docker.sh create mode 100644 conf/.env.dev create mode 100755 conf/.gitattributes delete mode 100644 docker/Dockerfile delete mode 100644 docker/nginx_conf/nginx.conf rename {docker/nginx_conf => nginx_conf}/.gitattributes (100%) create mode 100644 nginx_conf/nginx.conf rename {docker/nginx_conf => nginx_conf}/nginx.conf.default (100%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3eb6933c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM nginx:stable-alpine +COPY nginx_conf/nginx.conf /etc/nginx/nginx.conf +COPY dist/* /usr/share/nginx/html/ + +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/build_Docker.sh b/build_Docker.sh new file mode 100755 index 00000000..d4ee768f --- /dev/null +++ b/build_Docker.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Start parameters: +# 1.-fileConfig +# Example: ./build_Docker.sh ./nginx_conf/.env.dev + +# Init variables +fileConfig=$1; +now="$(date +'%d-%m-%Y %H:%M:%S:%3N')" +base_dir=`pwd` + +# Load environment variables +if [ -f "$fileConfig" ] +then + echo "" + echo " Loading config from $fileConfig" + echo "" + + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}='${value}' + done < "$fileConfig" + + echo " Date: "${now} + echo " ======================================================" + echo "" + echo " Initializing variables " + echo "" + echo " ======================================================" + echo " REGISTRY_NAME="${REGISTRY_NAME} + + else + echo "$fileConfig not found." + fi + +#./gradlew :itachallenge-challenge:clean && ./gradlew :itachallenge-challenge:build + +ng build --configuration production + +docker build -t=${REGISTRY_NAME}:nginx-itachallenge-${NGINX_FRONTEND_TAG} . + +#upload image to DockerHub +if [ ${ENV} = "dev" ] || [ ${ENV} = "pre" ]; +then + docker push ${REGISTRY_NAME}:nginx-itachallenge-${NGINX_FRONTEND_TAG} +fi diff --git a/conf/.env.dev b/conf/.env.dev new file mode 100644 index 0000000000000000000000000000000000000000..26d37c9da1b41e2588013ce5ba3fb71d652245e1 GIT binary patch literal 105 zcmV-v0G9s%M@dveQdv+`0JMr>qvme%n_7bhb<)M$T7=PfDf$;R$2+M`Mnk5zw^obZ zM(WgQDQA$20)QSPvKlZkn~p$j%(*h9#o9h4J9m6nEDz>;J& LFann?U`!?GA}uhH literal 0 HcmV?d00001 diff --git a/conf/.gitattributes b/conf/.gitattributes new file mode 100755 index 00000000..26083c9b --- /dev/null +++ b/conf/.gitattributes @@ -0,0 +1,3 @@ +.env.d* filter=git-crypt diff=git-crypt +.env.p* filter=git-crypt diff=git-crypt +.gitattributes !filter !diff \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/nginx_conf/nginx.conf b/docker/nginx_conf/nginx.conf deleted file mode 100644 index e1a2a37c935faab20446f41320fd1bf0fdacea5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3347 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 dSD)&})fLS|iz_4KZKp3*c6-aj?^W4P)gH!+j literal 0 HcmV?d00001 diff --git a/docker/nginx_conf/nginx.conf.default b/nginx_conf/nginx.conf.default similarity index 100% rename from docker/nginx_conf/nginx.conf.default rename to nginx_conf/nginx.conf.default