Skip to content

Commit

Permalink
build: curl accidentally removed from docker image (#28918) (#28921)
Browse files Browse the repository at this point in the history
### Proposed Changes
* Update packages like curl missing from final image that were previousl
in the base.
* core-web/.nvmrc file is re-generated from the build every time but the
file in master currently has an extra new line which is removed on each
build. Including this just to fix it so it does not get added to others
changelists going forward.

I will restructure this after this fix to improve the base image build
and reduce the final image size.

Test that curl is available in the resulting image and that a custom
starter can be specified and used
  • Loading branch information
spbolton authored Jun 18, 2024
1 parent d834374 commit f1d15fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core-web/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.20.3
v18.20.3
11 changes: 10 additions & 1 deletion dotCMS/src/main/docker/original/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,17 @@ RUN apt update && \
apt upgrade -y && \
apt install -y --no-install-recommends \
wget \
curl \
gnupg \
tini && \
tini \
zip \
unzip \
libtcnative-1 \
tzdata \
ca-certificates \
openssl \
libapr1 \
libpq-dev && \
rm -rf /var/lib/apt/lists/*

# Install PostgreSQL client and pg_dump
Expand Down

0 comments on commit f1d15fb

Please sign in to comment.