Skip to content

Commit

Permalink
Update node base images
Browse files Browse the repository at this point in the history
  • Loading branch information
BWibo committed Jan 13, 2024
1 parent 1162dca commit d719233
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
# GitHub https://github.com/3dcitydb/3dcitydb-web-map
###############################################################################
# Base image
ARG baseimage_tag='10'
ARG baseimage_tag='21-bookworm'
FROM "node:${baseimage_tag}"
# Maintainer ##################################################################
# Bruno Willenborg
# Chair of Geoinformatics
# Department of Civil, Geo and Environmental Engineering
# Technical University of Munich (TUM)
# <[email protected]>
MAINTAINER Bruno Willenborg, Chair of Geoinformatics, Technical University of Munich (TUM) <[email protected]>
# MAINTAINER Bruno Willenborg, Chair of Geoinformatics, Technical University of Munich (TUM) <[email protected]>

# Setup 3DCityDB Web Map Client ###############################################
ARG webmapclient_version='v1.6.0'
ARG webmapclient_version='v1.9.1'
RUN set -x \
&& BUILD_PACKAGES='ca-certificates git' \
&& apt-get update && apt-get install -y --no-install-recommends $BUILD_PACKAGES \
Expand All @@ -23,12 +23,12 @@ RUN set -x \
&& rm -rf ./.git ./.gitignore ./LICENSE ./README.md ./build.xml \
./node_modules ./server.js $(ls -1 --ignore=ajax-loader.gif --ignore=favicon.png \
--ignore=GPS_off.png --ignore=GPS_on.png --ignore=GPS_on_ori.png --ignore=GPS_on_pos_ori.png \
./theme/img) \
./theme/img) \
&& mkdir -p /var/www/data \
&& apt-get purge -y --auto-remove $BUILD_PACKAGES \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /var/www/
WORKDIR /var/www/
COPY package.json ./
COPY html/* ./
COPY server.js ./
Expand Down
8 changes: 4 additions & 4 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# GitHub https://github.com/3dcitydb/3dcitydb-web-map
###############################################################################
# Base image
ARG baseimage_tag='10-alpine'
ARG baseimage_tag='21-alpine'
FROM node:${baseimage_tag}
# Maintainer ##################################################################
# Bruno Willenborg
Expand All @@ -14,19 +14,19 @@ FROM node:${baseimage_tag}
MAINTAINER Bruno Willenborg, Chair of Geoinformatics, Technical University of Munich (TUM) <[email protected]>

# Setup 3DCityDB Web Map Client ###############################################
ARG webmapclient_version='v1.6.0'
ARG webmapclient_version='v1.9.1'
RUN set -x && \
apk update && \
apk add --no-cache --virtual .fetch-deps openssl git && \
git clone -b "${webmapclient_version}" --depth 1 \
https://github.com/3dcitydb/3dcitydb-web-map.git /var/www && \
cd /var/www && \
rm -rf .git .gitignore LICENSE README.md build.xml \
node_modules server.js && \
node_modules server.js && \
mkdir -p /var/www/data && \
apk del .fetch-deps

WORKDIR /var/www/
WORKDIR /var/www/
COPY package.json ./
COPY html/* ./
COPY server.js ./
Expand Down

0 comments on commit d719233

Please sign in to comment.