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 b76b18a..a41787a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM node:18-bullseye +FROM node:22-bookworm ARG SRV_UID="1000" -ARG SRV_GID="100" +ARG SRV_GID="1000" ARG SRV_VERSION="0" ENV SRV_UID $SRV_UID @@ -14,6 +14,8 @@ 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 d4e3976..8825143 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,31 @@ -# Alias for bash +# 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 ```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 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 <