diff --git a/.dockerignore b/.dockerignore index 07ddf8d..5a76776 100644 --- a/.dockerignore +++ b/.dockerignore @@ -24,7 +24,6 @@ table_meta* /*.pdf .gitignore -.bash_history node_modules local diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c9544d..d066caa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker:latest +image: docker:20.10.16 variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG @@ -9,7 +9,7 @@ stages: - release services: - - docker:dind + - docker:20.10.16-dind build: stage: build diff --git a/Dockerfile b/Dockerfile index a41787a..b76b18a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM node:22-bookworm +FROM node:18-bullseye ARG SRV_UID="1000" -ARG SRV_GID="1000" +ARG SRV_GID="100" ARG SRV_VERSION="0" ENV SRV_UID $SRV_UID @@ -14,8 +14,6 @@ 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.10.0 @angular/cli@18.1.2 npm@10.8.2 - COPY ./docker-entrypoint.sh /docker-entrypoint.sh USER $SRV_UID:$SRV_GID diff --git a/README.md b/README.md index 8825143..d4e3976 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,5 @@ -# Node 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 - -``` -src.ci/srv/node:latest -``` - -### Alias for bash +# Alias for bash ```shell -alias srvnode='docker run --rm -it -v $(pwd):/app src.ci/srv/node:latest' +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/docker-entrypoint.sh b/docker-entrypoint.sh index 839b791..a9fb872 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,17 +2,6 @@ export IP=$( hostname -i ) -cat <