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/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index d507b8f1a..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=$_GIT_TAG + - 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" 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;"]