DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8344 from strongjz/tag-1.1.3

Browse source 
update tag and force a new build
This commit is contained in:
James Strong 2022-03-16 15:15:08 -04:00 committed by GitHub
commit a1853be930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TAG
View file

@ -1 +1 @@
v1.1.2 v1.1.3

4
images/nginx/cloudbuild.yaml
View file

@ -8,7 +8,7 @@ steps:
entrypoint: bash entrypoint: bash
env: env:
- DOCKER_CLI_EXPERIMENTAL=enabled - DOCKER_CLI_EXPERIMENTAL=enabled
- TAG=$_GIT_TAG - COMMIT=$SHORT_SHA
- BASE_REF=$_PULL_BASE_REF - BASE_REF=$_PULL_BASE_REF
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
# default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
@ -18,7 +18,7 @@ steps:
- -c - -c
- | - |
gcloud auth configure-docker \ gcloud auth configure-docker \
&& make push && TAG=v$(date "+%Y%m%d")-${COMMIT} make push
substitutions: substitutions:
_GIT_TAG: "12345" _GIT_TAG: "12345"
_PULL_BASE_REF: "master" _PULL_BASE_REF: "master"

3
images/nginx/rootfs/Dockerfile
View file

@ -11,8 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.15.0 as builder FROM alpine:3.15.0 as builder
COPY . / COPY . /
@ -74,4 +72,5 @@ RUN apk update \
EXPOSE 80 443 EXPOSE 80 443
ENTRYPOINT ["/usr/local/entrypoint.sh"] ENTRYPOINT ["/usr/local/entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]