feat(docker): install @ship.zone/szci in base images, add docker-entrypoint and use tini, remove deprecated Dockerfile_dbase_npmci, bump @git.zone/tsdocker devDependency to ^1.17.4
This commit is contained in:
@@ -54,7 +54,8 @@ RUN NVM_MUSL_ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "arm64-musl" || echo "x6
|
||||
&& nvm use default \
|
||||
&& npm install -g pnpm \
|
||||
&& pnpm -v \
|
||||
&& pnpm config set unsafe-perm true
|
||||
&& pnpm config set unsafe-perm true \
|
||||
&& pnpm install -g @ship.zone/szci
|
||||
|
||||
ENV NODE_PATH=$NVM_DIR/versions/node/v$NODE_VERSION_LTS/lib/node_modules
|
||||
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION_LTS/bin:$PATH
|
||||
|
||||
@@ -28,9 +28,10 @@ RUN printf '%s\n%s\n%s\n' \
|
||||
'[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"' \
|
||||
> /etc/bash.bashrc
|
||||
|
||||
# Copy nvm wrapper for build-time SHELL
|
||||
# Copy nvm wrapper scripts
|
||||
COPY image_support_files/bash-with-nvm /usr/local/bin/bash-with-nvm
|
||||
RUN chmod +x /usr/local/bin/bash-with-nvm
|
||||
COPY image_support_files/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/bash-with-nvm /usr/local/bin/docker-entrypoint.sh
|
||||
|
||||
# Use wrapper for RUN commands to enable nvm
|
||||
SHELL ["/usr/local/bin/bash-with-nvm"]
|
||||
@@ -52,10 +53,11 @@ RUN NVM_MUSL_ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "arm64-musl" || echo "x6
|
||||
&& nvm use default \
|
||||
&& npm install -g pnpm \
|
||||
&& pnpm -v \
|
||||
&& pnpm config set unsafe-perm true
|
||||
&& pnpm config set unsafe-perm true \
|
||||
&& pnpm install -g @ship.zone/szci
|
||||
|
||||
ENV NODE_PATH=$NVM_DIR/versions/node/v$NODE_VERSION_LTS/lib/node_modules
|
||||
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION_LTS/bin:$PATH
|
||||
|
||||
# Keep docker:dind's own ENTRYPOINT (dockerd-entrypoint.sh)
|
||||
# NVM is available in exec shells via BASH_ENV
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]
|
||||
CMD ["bash"]
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
FROM host.today/ht-docker-node:dbase
|
||||
LABEL author="Task Venture Capital GmbH <hello@task.vc>"
|
||||
RUN pnpm install -g @ship.zone/szci
|
||||
@@ -1,5 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-02-07 - 5.7.0 - feat(docker)
|
||||
install @ship.zone/szci in base images, add docker-entrypoint and use tini, remove deprecated Dockerfile_dbase_npmci, bump @git.zone/tsdocker devDependency to ^1.17.4
|
||||
|
||||
- Dockerfile_dbase: install @ship.zone/szci globally via pnpm
|
||||
- Dockerfile_dbase_dind: add docker-entrypoint.sh and make it executable, consolidate chmod, set ENTRYPOINT to run tini with the new entrypoint and default CMD to ["bash"], and install @ship.zone/szci
|
||||
- Remove Dockerfile_dbase_npmci (deleted)
|
||||
- package.json: bump devDependency @git.zone/tsdocker from ^1.17.1 to ^1.17.4
|
||||
|
||||
## 2026-02-07 - 5.6.0 - feat(dockerfiles)
|
||||
Add base Dockerfiles for dbase/dind, enable pnpm and stack-fix, update preinstalled image tooling and registries, and bump @git.zone/tsdocker devDependency
|
||||
|
||||
|
||||
@@ -35,6 +35,6 @@
|
||||
"typescript"
|
||||
],
|
||||
"devDependencies": {
|
||||
"@git.zone/tsdocker": "^1.17.1"
|
||||
"@git.zone/tsdocker": "^1.17.4"
|
||||
}
|
||||
}
|
||||
|
||||
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@@ -9,8 +9,8 @@ importers:
|
||||
.:
|
||||
devDependencies:
|
||||
'@git.zone/tsdocker':
|
||||
specifier: ^1.17.1
|
||||
version: 1.17.1
|
||||
specifier: ^1.17.4
|
||||
version: 1.17.4
|
||||
|
||||
packages:
|
||||
|
||||
@@ -45,8 +45,8 @@ packages:
|
||||
'@design.estate/dees-element@2.1.6':
|
||||
resolution: {integrity: sha512-7zyHkUjB8UEQgT9VbB2IJtc/yuPt9CI5JGel3b6BxA1kecY64ceIjFvof1uIkc0QP8q2fMLLY45r1c+9zDTjzg==}
|
||||
|
||||
'@git.zone/tsdocker@1.17.1':
|
||||
resolution: {integrity: sha512-wfPtOr3n/NPaKhp0jhr8PbHeJZpNvX5JOVo7PLhZd5iV6sM0H+0pZ6Su7Fzz4ct2ETpvaShrBfM5U0o9QKe+RA==}
|
||||
'@git.zone/tsdocker@1.17.4':
|
||||
resolution: {integrity: sha512-yuA7DfCLztkoPs0XetEP0gL7x/eh0g/e/tdTXJW7AciOBqgFvqoJ8iJCCIRgjT60NsctyEFUo9j1cgL/QxUr/w==}
|
||||
hasBin: true
|
||||
|
||||
'@inquirer/checkbox@3.0.1':
|
||||
@@ -1412,7 +1412,7 @@ snapshots:
|
||||
- supports-color
|
||||
- vue
|
||||
|
||||
'@git.zone/tsdocker@1.17.1':
|
||||
'@git.zone/tsdocker@1.17.4':
|
||||
dependencies:
|
||||
'@push.rocks/lik': 6.2.2
|
||||
'@push.rocks/npmextra': 5.3.3
|
||||
|
||||
Reference in New Issue
Block a user