Skip to content

Commit ce0c35b

Browse files
committed
Pass env vars direct in the docker file
1 parent c4d4e63 commit ce0c35b

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/docker-publish.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ on:
77
env:
88
REGISTRY: ghcr.io
99
IMAGE_NAME: openhistoricalmap/osmcha-frontend
10-
REACT_APP_PAGE_SIZE: "25"
11-
REACT_APP_OVERPASS_BASE: "//overpass-api.openhistoricalmap.org/api/interpreter"
12-
REACT_APP_MAPBOX_ACCESS_TOKEN: "pk.eyJ1Ijoib3Blbmhpc3RvcmljYWxtYXAiLCJhIjoiY202a3ZqcHN1MDJnYzJpcHhlczVqbXBuNiJ9.DvNrZEF1ISEluA9k-MSHtA"
13-
REACT_APP_OSM_URL: "https://www.openhistoricalmap.org"
14-
REACT_APP_OSM_API: "https://api.openhistoricalmap.org/api/0.6"
15-
REACT_APP_NOMINATIM_URL: "https://nominatim-api.openhistoricalmap.org/search.php"
16-
REACT_APP_DEFAULT_FROM_DATE: "2"
17-
REACT_APP_DEFAULT_TO_DATE: "5"
18-
REACT_APP_DISABLE_REAL_CHANGESETS: "false"
1910

2011
jobs:
2112
build:
@@ -55,14 +46,3 @@ jobs:
5546
labels: ${{ steps.meta.outputs.labels }}
5647
cache-from: type=gha
5748
cache-to: type=gha,mode=max
58-
build-args: |
59-
REACT_APP_PAGE_SIZE=${{ env.REACT_APP_PAGE_SIZE }}
60-
REACT_APP_OVERPASS_BASE=${{ env.REACT_APP_OVERPASS_BASE }}
61-
REACT_APP_MAPBOX_ACCESS_TOKEN=${{ env.REACT_APP_MAPBOX_ACCESS_TOKEN }}
62-
REACT_APP_OSM_URL=${{ env.REACT_APP_OSM_URL }}
63-
REACT_APP_OSM_API=${{ env.REACT_APP_OSM_API }}
64-
REACT_APP_NOMINATIM_URL=${{ env.REACT_APP_NOMINATIM_URL }}
65-
REACT_APP_DEFAULT_FROM_DATE=${{ env.REACT_APP_DEFAULT_FROM_DATE }}
66-
REACT_APP_DEFAULT_TO_DATE=${{ env.REACT_APP_DEFAULT_TO_DATE }}
67-
REACT_APP_DISABLE_REAL_CHANGESETS=${{ env.REACT_APP_DISABLE_REAL_CHANGESETS }}
68-

Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ FROM node:22-alpine as builder
22

33
ENV DEBIAN_FRONTEND noninteractive
44

5+
ENV REACT_APP_PAGE_SIZE: "25"
6+
ENV REACT_APP_OVERPASS_BASE: "//overpass-api.openhistoricalmap.org/api/interpreter"
7+
ENV REACT_APP_MAPBOX_ACCESS_TOKEN: "pk.eyJ1Ijoib3Blbmhpc3RvcmljYWxtYXAiLCJhIjoiY202a3ZqcHN1MDJnYzJpcHhlczVqbXBuNiJ9.DvNrZEF1ISEluA9k-MSHtA"
8+
ENV REACT_APP_OSM_URL: "https://www.openhistoricalmap.org"
9+
ENV REACT_APP_OSM_API: "https://api.openhistoricalmap.org/api/0.6"
10+
ENV REACT_APP_NOMINATIM_URL: "https://nominatim-api.openhistoricalmap.org/search.php"
11+
ENV REACT_APP_DEFAULT_FROM_DATE: "2"
12+
ENV REACT_APP_DEFAULT_TO_DATE: "5"
13+
ENV REACT_APP_DISABLE_REAL_CHANGESETS: "false"
14+
515
ARG BUILD_ENV=prod
616

717
WORKDIR /app

0 commit comments

Comments
 (0)