From 3a2e9816e44650d9278547ee9f20dc43ffaa6234 Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Wed, 12 Jul 2023 03:32:09 +0200 Subject: [PATCH 01/10] Added angular cli into default setup and upgraded npm --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index b76b18a..ff75b1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,8 @@ RUN id $SRV_UID || useradd -s /bin/bash -d /app -u $SRV_UID -g $SRV_GID srv COPY ./docker-entrypoint.sh /docker-entrypoint.sh +RUN npm install -g @angular/cli@16.1.4 npm@9.8.0 + USER $SRV_UID:$SRV_GID ENV PATH "/app/node_modules/.bin:$PATH" From 6f0ffb7a23f3f1ae73ad26c02ae9bb9f3b75ebde Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 11 Feb 2024 01:21:09 +0100 Subject: [PATCH 02/10] Ember time --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff75b1b..83f7c79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-bullseye +FROM node:21-bookworm ARG SRV_UID="1000" ARG SRV_GID="100" @@ -16,7 +16,7 @@ RUN id $SRV_UID || useradd -s /bin/bash -d /app -u $SRV_UID -g $SRV_GID srv COPY ./docker-entrypoint.sh /docker-entrypoint.sh -RUN npm install -g @angular/cli@16.1.4 npm@9.8.0 +RUN npm install -g ember-cli@5.6.0 npm@10.4.0 USER $SRV_UID:$SRV_GID From 0aaa3d2ff366790a9a257b579a1d9d3d86018fc1 Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 11 Feb 2024 04:13:58 +0100 Subject: [PATCH 03/10] Show IP, a bit ascii art! --- Dockerfile | 6 +++--- docker-entrypoint.sh | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83f7c79..1bd0888 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:21-bookworm +FROM node:20-bookworm ARG SRV_UID="1000" ARG SRV_GID="100" @@ -14,10 +14,10 @@ RUN apt-get update -y && apt-get install -y jq $SRV_APT_GET_INSTALL \ RUN id $SRV_UID || useradd -s /bin/bash -d /app -u $SRV_UID -g $SRV_GID srv -COPY ./docker-entrypoint.sh /docker-entrypoint.sh - RUN npm install -g ember-cli@5.6.0 npm@10.4.0 +COPY ./docker-entrypoint.sh /docker-entrypoint.sh + USER $SRV_UID:$SRV_GID ENV PATH "/app/node_modules/.bin:$PATH" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a9fb872..839b791 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,6 +2,17 @@ export IP=$( hostname -i ) +cat < Date: Sun, 31 Mar 2024 00:20:24 +0100 Subject: [PATCH 04/10] Switching to Node 21, updating to latest docker for CI, changing GID to 1000, adding back angular-cli, more README --- .dockerignore | 1 + .gitlab-ci.yml | 4 ++-- Dockerfile | 6 +++--- README.md | 26 +++++++++++++++++++++++++- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index 5a76776..07ddf8d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -24,6 +24,7 @@ table_meta* /*.pdf .gitignore +.bash_history node_modules local diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d066caa..9c9544d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker:20.10.16 +image: docker:latest variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG @@ -9,7 +9,7 @@ stages: - release services: - - docker:20.10.16-dind + - docker:dind build: stage: build diff --git a/Dockerfile b/Dockerfile index 1bd0888..3952cc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM node:20-bookworm +FROM node:21-bookworm ARG SRV_UID="1000" -ARG SRV_GID="100" +ARG SRV_GID="1000" ARG SRV_VERSION="0" ENV SRV_UID $SRV_UID @@ -14,7 +14,7 @@ RUN apt-get update -y && apt-get install -y jq $SRV_APT_GET_INSTALL \ RUN id $SRV_UID || useradd -s /bin/bash -d /app -u $SRV_UID -g $SRV_GID srv -RUN npm install -g ember-cli@5.6.0 npm@10.4.0 +RUN npm install -g ember-cli@5.7.0 @angular/cli@17.3.2 npm@10.4.0 COPY ./docker-entrypoint.sh /docker-entrypoint.sh diff --git a/README.md b/README.md index d4e3976..8f413d9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,28 @@ -# Alias for bash +# MinIO Image + +## How To Use + +### Args + +#### SRV_UID + +User ID for the MinIO daemon and so of the data (Default: 1000) + +#### SRV_GID + +Group ID for the MinIO daemon and so of the data (Default: 1000) + +#### SRV_APT_GET_INSTALL + +Additional Debian modules installed + +### Image Name + +``` +docker.ci/srv/node:latest +``` + +### Alias for bash ```shell alias srvnode='docker run --rm -it -v $(pwd):/app docker.ci/srv/node:latest' From 7eed54098554d5d62607dc57c7c1ffa234e3799b Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 31 Mar 2024 01:49:20 +0100 Subject: [PATCH 05/10] Its node not MinIO --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f413d9..fb03be2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MinIO Image +# Node Image ## How To Use From a8373ca11af96856e8fdb19f3a5605391572adc6 Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 28 Jul 2024 01:49:25 +0200 Subject: [PATCH 06/10] Updating versions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3952cc0..0b6a246 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -y && apt-get install -y jq $SRV_APT_GET_INSTALL \ RUN id $SRV_UID || useradd -s /bin/bash -d /app -u $SRV_UID -g $SRV_GID srv -RUN npm install -g ember-cli@5.7.0 @angular/cli@17.3.2 npm@10.4.0 +RUN npm install -g ember-cli@5.10.0 @angular/cli@18.1.2 npm@10.8.2 COPY ./docker-entrypoint.sh /docker-entrypoint.sh From 84450546cedf4cd7870da7b449d1fbf6cfe0f39c Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 28 Jul 2024 04:07:09 +0200 Subject: [PATCH 07/10] Added up srvnode script --- Dockerfile | 3 ++- README.md | 2 ++ ex/srvnode | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 ex/srvnode diff --git a/Dockerfile b/Dockerfile index 0b6a246..035ada3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ USER $SRV_UID:$SRV_GID ENV PATH "/app/node_modules/.bin:$PATH" RUN ln -s /app/.bash_history $HOME/.bash_history \ - && ln -s /app/.npmrc $HOME/.npmrc + && ln -s /app/.npmrc $HOME/.npmrc \ + && git config --global init.defaultBranch main VOLUME /app diff --git a/README.md b/README.md index fb03be2..2f30686 100644 --- a/README.md +++ b/README.md @@ -27,3 +27,5 @@ docker.ci/srv/node:latest ```shell alias srvnode='docker run --rm -it -v $(pwd):/app docker.ci/srv/node:latest' ``` + +Alternative you can use the included `srvnode` command in the `ex` directory diff --git a/ex/srvnode b/ex/srvnode new file mode 100755 index 0000000..a5a20ab --- /dev/null +++ b/ex/srvnode @@ -0,0 +1,28 @@ +#!/bin/bash + +DOCKER_RUN_CMD="docker run --rm -it" + +VOLUMES="-v $(pwd):/app" + +if [[ -f "$HOME/.gitconfig" ]] +then + VOLUMES="$VOLUMES -v $HOME/.gitconfig:/home/node/.gitconfig" +fi + +if [[ -d "$HOME/.ssh" ]] +then + VOLUMES="$VOLUMES -v $HOME/.ssh:/home/node/.ssh" +fi + +DOCKER_RUN_CMD="$DOCKER_RUN_CMD $VOLUMES docker.ci/srv/node:latest" + +shift + +if [[ -z "$@" ]] +then + echo Executing: $DOCKER_RUN_CMD bash + exec $DOCKER_RUN_CMD bash +else + echo Executing: $DOCKER_RUN_CMD $@ + exec $DOCKER_RUN_CMD $@ +fi From 32b83d3811bab386fabf6ab50290974fb74565c5 Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 28 Jul 2024 04:38:56 +0200 Subject: [PATCH 08/10] New node --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 035ada3..2de4bbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:21-bookworm +FROM node:22-bookworm ARG SRV_UID="1000" ARG SRV_GID="1000" From 6fd377f84834bcc6726e1d397488c5f69145f13b Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sun, 28 Jul 2024 04:52:20 +0200 Subject: [PATCH 09/10] hups git config not necessary --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2de4bbc..a41787a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,7 @@ USER $SRV_UID:$SRV_GID ENV PATH "/app/node_modules/.bin:$PATH" RUN ln -s /app/.bash_history $HOME/.bash_history \ - && ln -s /app/.npmrc $HOME/.npmrc \ - && git config --global init.defaultBranch main + && ln -s /app/.npmrc $HOME/.npmrc VOLUME /app From ea563b90c6bd953eeb7822614312f2809efbed2d Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Sat, 26 Oct 2024 04:26:03 +0200 Subject: [PATCH 10/10] Updated docker URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f30686..8825143 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ Additional Debian modules installed ### Image Name ``` -docker.ci/srv/node:latest +src.ci/srv/node:latest ``` ### Alias for bash ```shell -alias srvnode='docker run --rm -it -v $(pwd):/app docker.ci/srv/node:latest' +alias srvnode='docker run --rm -it -v $(pwd):/app src.ci/srv/node:latest' ``` Alternative you can use the included `srvnode` command in the `ex` directory