Commit ·
f00c4f2
1
Parent(s): f655ad5
fix: migrate to Alpine package manager for newer OSRM base image
Browse files- Dockerfile +4 -10
- start.sh +1 -1
Dockerfile
CHANGED
|
@@ -8,18 +8,12 @@ RUN npm run build && ls -la dist/
|
|
| 8 |
|
| 9 |
FROM ghcr.io/project-osrm/osrm-backend:latest AS runtime
|
| 10 |
|
| 11 |
-
ENV DEBIAN_FRONTEND=noninteractive
|
| 12 |
ENV TZ=UTC
|
| 13 |
|
| 14 |
-
RUN
|
| 15 |
-
curl wget ca-certificates gnupg
|
| 16 |
-
&& rm -rf /var/lib/apt/lists/*
|
| 17 |
|
| 18 |
-
RUN
|
| 19 |
-
&& apt-get install -y nodejs \
|
| 20 |
-
&& rm -rf /var/lib/apt/lists/*
|
| 21 |
-
|
| 22 |
-
RUN useradd -m -u 1000 user
|
| 23 |
ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
|
| 24 |
|
| 25 |
RUN mkdir -p /data && chmod 777 /data
|
|
@@ -36,7 +30,7 @@ WORKDIR $HOME/app
|
|
| 36 |
COPY --chown=user --from=backend-builder /build/backend/dist ./backend/dist
|
| 37 |
COPY --chown=user --from=backend-builder /build/backend/node_modules ./backend/node_modules
|
| 38 |
|
| 39 |
-
COPY --chown=user supervisord.conf /etc/
|
| 40 |
COPY --chown=user start.sh ./start.sh
|
| 41 |
RUN chmod +x ./start.sh
|
| 42 |
|
|
|
|
| 8 |
|
| 9 |
FROM ghcr.io/project-osrm/osrm-backend:latest AS runtime
|
| 10 |
|
|
|
|
| 11 |
ENV TZ=UTC
|
| 12 |
|
| 13 |
+
RUN apk update && apk add --no-cache \
|
| 14 |
+
curl wget ca-certificates gnupg supervisor nodejs npm bash
|
|
|
|
| 15 |
|
| 16 |
+
RUN adduser -D -u 1000 user
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
|
| 18 |
|
| 19 |
RUN mkdir -p /data && chmod 777 /data
|
|
|
|
| 30 |
COPY --chown=user --from=backend-builder /build/backend/dist ./backend/dist
|
| 31 |
COPY --chown=user --from=backend-builder /build/backend/node_modules ./backend/node_modules
|
| 32 |
|
| 33 |
+
COPY --chown=user supervisord.conf /etc/supervisord.conf
|
| 34 |
COPY --chown=user start.sh ./start.sh
|
| 35 |
RUN chmod +x ./start.sh
|
| 36 |
|
start.sh
CHANGED
|
@@ -16,4 +16,4 @@ fi
|
|
| 16 |
echo "OSRM data found"
|
| 17 |
|
| 18 |
# Start supervisord (manages OSRM + Express)
|
| 19 |
-
exec supervisord -c /etc/
|
|
|
|
| 16 |
echo "OSRM data found"
|
| 17 |
|
| 18 |
# Start supervisord (manages OSRM + Express)
|
| 19 |
+
exec supervisord -c /etc/supervisord.conf
|