Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Node 16 image #149

Merged
merged 3 commits into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,11 @@ versioned-images := php-7.2-fpm \
node-10 \
node-12 \
node-14 \
node-16 \
node-10-builder \
node-12-builder \
node-14-builder \
node-16-builder \
solr-5.5 \
solr-6.6 \
solr-7.7 \
Expand Down Expand Up @@ -226,10 +228,11 @@ build/php-8.0-cli-drupal: build/php-8.0-cli
build/python-2.7 build/python-3.7 build/python-3.8: build/commons
build/python-2.7-ckan: build/python-2.7
build/python-2.7-ckandatapusher: build/python-2.7
build/node-10 build/node-12 build/node-14: build/commons
build/node-10 build/node-12 build/node-14 build/node-16: build/commons
build/node-10-builder: build/node-10
build/node-12-builder: build/node-12
build/node-14-builder: build/node-14
build/node-16-builder: build/node-16
build/solr-5.5 build/solr-6.6 build/solr-7.7: build/commons
build/solr-5.5-drupal: build/solr-5.5
build/solr-6.6-drupal: build/solr-6.6
Expand Down
35 changes: 35 additions & 0 deletions images/node-builder/16.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/node-16

LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

ENV LAGOON=node

RUN apk update \
&& apk upgrade \
&& apk add --no-cache \
libstdc++ \
&& apk add --no-cache \
binutils-gold \
curl \
g++ \
gcc \
gnupg \
libgcc \
linux-headers \
make \
git \
file \
openssl \
python3 \
bash \
ca-certificates \
wget \
libpng-dev \
&& wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
&& wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.33-r0/glibc-2.33-r0.apk \
&& apk add glibc-2.33-r0.apk \
&& rm -rf /var/cache/apk/*

CMD ["/bin/docker-sleep"]
49 changes: 49 additions & 0 deletions images/node/16.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/commons as commons
FROM node:16.0-alpine3.12

LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

ENV LAGOON=node

ARG LAGOON_VERSION
ENV LAGOON_VERSION=$LAGOON_VERSION

# Copy commons files
COPY --from=commons /lagoon /lagoon
COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
COPY --from=commons /sbin/tini /sbin/
COPY --from=commons /home /home

RUN fix-permissions /etc/passwd \
&& mkdir -p /home \
&& fix-permissions /home \
&& mkdir -p /app \
&& fix-permissions /app

ENV TMPDIR=/tmp \
TMP=/tmp \
HOME=/home \
# When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
ENV=/home/.bashrc \
# When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
BASH_ENV=/home/.bashrc

RUN apk update \
&& apk upgrade \
&& rm -rf /var/cache/apk/*

# Make sure Bower and NPM are allowed to be running as root
RUN echo '{ "allow_root": true }' > /home/.bowerrc \
&& echo 'unsafe-perm=true' > /home/.npmrc

WORKDIR /app

EXPOSE 3000

# tells the local development environment on which port we are running
ENV LAGOON_LOCALDEV_HTTP_PORT=3000

ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
CMD ["yarn", "run", "start"]