From 2fefd714bdb76779365636b9ae91e63eac2198f1 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 16 Mar 2022 12:57:48 -0400 Subject: [PATCH 1/4] update tag and force a new build Signed-off-by: James Strong --- TAG | 2 +- images/nginx/rootfs/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TAG b/TAG index 0f1acbd56..99a4aef0c 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -v1.1.2 +v1.1.3 diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index 9cc5539ae..d39863aec 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -11,8 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - FROM alpine:3.15.0 as builder COPY . / @@ -74,4 +72,5 @@ RUN apk update \ EXPOSE 80 443 ENTRYPOINT ["/usr/local/entrypoint.sh"] + CMD ["nginx", "-g", "daemon off;"] From 952a6dc22ca4a01d62162245e539daf4e827c014 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 16 Mar 2022 14:52:06 -0400 Subject: [PATCH 2/4] control tag with short sha Signed-off-by: James Strong --- images/nginx/cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index d507b8f1a..1e524af21 100644 --- a/images/nginx/cloudbuild.yaml +++ b/images/nginx/cloudbuild.yaml @@ -8,7 +8,7 @@ steps: entrypoint: bash env: - DOCKER_CLI_EXPERIMENTAL=enabled - - TAG=$_GIT_TAG + - TAG=$SHORT_SHA - BASE_REF=$_PULL_BASE_REF - REGISTRY=gcr.io/k8s-staging-ingress-nginx # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx From 0e2447ed0e41dd441dfb2b2a44559c35b40c1de4 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 16 Mar 2022 15:07:38 -0400 Subject: [PATCH 3/4] add the date per request Signed-off-by: James Strong --- images/nginx/cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index 1e524af21..6c1f844ec 100644 --- a/images/nginx/cloudbuild.yaml +++ b/images/nginx/cloudbuild.yaml @@ -8,7 +8,7 @@ steps: entrypoint: bash env: - DOCKER_CLI_EXPERIMENTAL=enabled - - TAG=$SHORT_SHA + - TAG=v$(date "+%Y%m%d")-$SHORT_SHA - BASE_REF=$_PULL_BASE_REF - REGISTRY=gcr.io/k8s-staging-ingress-nginx # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx From 5c47803d0f0d37cd83dc942a7e1c3ccd8565681a Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 16 Mar 2022 15:13:24 -0400 Subject: [PATCH 4/4] fix the cloud build Signed-off-by: James Strong --- images/nginx/cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index 6c1f844ec..b5b906a8d 100644 --- a/images/nginx/cloudbuild.yaml +++ b/images/nginx/cloudbuild.yaml @@ -8,7 +8,7 @@ steps: entrypoint: bash env: - DOCKER_CLI_EXPERIMENTAL=enabled - - TAG=v$(date "+%Y%m%d")-$SHORT_SHA + - COMMIT=$SHORT_SHA - BASE_REF=$_PULL_BASE_REF - REGISTRY=gcr.io/k8s-staging-ingress-nginx # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx @@ -18,7 +18,7 @@ steps: - -c - | gcloud auth configure-docker \ - && make push + && TAG=v$(date "+%Y%m%d")-${COMMIT} make push substitutions: _GIT_TAG: "12345" _PULL_BASE_REF: "master"