diff --git a/Dockerfile b/Dockerfile index 089d5f4..0a3c277 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sombochea@cubetiqs.com" # Build with root access USER root -ENV NODE_VERSION 16.13.1 -ENV NODE_SHA256 3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf +ENV NODE_VERSION 16.15.0 +ENV NODE_SHA256 4db62cabc0647fc18f537ed10b5573f3c23ffb4d4434e40713e7e472f1ed4e55 ENV USER_UID 1001 RUN addgroup -g ${USER_UID} node \ @@ -80,7 +80,7 @@ RUN addgroup -g ${USER_UID} node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/Dockerfile.git b/Dockerfile.git new file mode 100644 index 0000000..147d7b3 --- /dev/null +++ b/Dockerfile.git @@ -0,0 +1,12 @@ +FROM cubetiq/calpine-node:latest +LABEL maintainer="sombochea@cubetiqs.com" + +RUN apk update && apk add --no-cache git + +COPY entrypoint.sh /usr/local/bin/ + +RUN chmod +x /usr/local/bin/entrypoint.sh + +ENTRYPOINT ["entrypoint.sh"] + +CMD [ "node" ] \ No newline at end of file diff --git a/Makefile b/Makefile index 32a3b7d..cfe7ac8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ DOCKER_IMAGE=cubetiq/calpine-node +DOCKER_IMAGE_GIT=cubetiq/calpine-node-git DOCKER_IMAGE_NAME=${DOCKER_IMAGE}:16 build: @@ -10,4 +11,10 @@ build: docker push ${DOCKER_IMAGE} docker push ${DOCKER_IMAGE_NAME} + @echo 'Starting docker build with git' + docker build -f Dockfile.git . -t ${DOCKER_IMAGE} + + @echo 'Starting docker push with git' + docker push ${DOCKER_IMAGE_GIT} + .PHONY:build \ No newline at end of file diff --git a/README.md b/README.md index d6388f2..c7db10c 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,26 @@ # CUBETIQ Alpine OS Linux with Nodejs 16 + ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/cubetiq/calpine-node) ![Docker Pulls](https://img.shields.io/docker/pulls/cubetiq/calpine-node) -- CUBETIQ Alpine OS Linux (3.13.3) -- Nodejs 16 (16.13.1) -- Yarn 1.22.17 +- CUBETIQ Alpine OS Linux +- Nodejs 16 (16.15.0) +- Yarn 1.22.18 # [Docker Hub](https://hub.docker.com/r/cubetiq/calpine-node) + ```shell docker push cubetiq/calpine-node:latest ``` # Usage + ```shell docker run --rm -it cubetiq/calpine-node:latest /bin/sh ``` # Example + ```Dockerfile FROM cubetiq/calpine-node:latest LABEL maintainer="sombochea@cubetiqs.com" @@ -31,9 +35,11 @@ CMD [ "node" , "index.js"] ``` # Contributors + - Sambo Chea # License + ```text MIT License @@ -55,4 +61,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECT -``` \ No newline at end of file +```