Skip to content

Commit 8c0e307

Browse files
authored
Merge pull request #17 from blue-core-lod/inject-keycloak-var
Builds Sinopia Image to use correct Keycloak and Sinopia Variables
2 parents 9a18b95 + 1297e1c commit 8c0e307

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- name: Build and push Docker image
1616
run: |
1717
docker login --username blue-core-lod --password ${{ secrets.GITHUB_TOKEN }} ghcr.io
18-
docker build . --tag ghcr.io/blue-core-lod/sinopia:latest
18+
docker build --tag ghcr.io/blue-core-lod/sinopia:latest --build-arg KEYCLOAK_URL=${{ vars.KEYCLOAK_URL }} --build-arg SINOPIA_URI=${{ vars.SINOPIA_URI }} .
1919
docker push ghcr.io/blue-core-lod/sinopia:latest

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ ARG SINOPIA_URI=http://localhost/sinopia
77
ARG SINOPIA_ENV=bluecore
88
ARG INDEX_URL
99
ARG EXPORT_BUCKET_URL
10+
ARG KEYCLOAK_URL
1011

1112
# Set environment variables from the build args
12-
ENV INDEX_URL ${INDEX_URL}
13+
ENV INDEX_URL=$INDEX_URL
14+
ENV KEYCLOAK_URL=$KEYCLOAK_URL
15+
ENV SINOPIA_URL=$SINOPIA_URL
1316

1417
COPY package.json .
1518
COPY package-lock.json .

src/Config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Config {
7070
*/
7171
static get searchPath() {
7272
// return "/api/search/sinopia_resources/_search"
73-
return "/search"
73+
return "/api/search"
7474
}
7575

7676
static get templateSearchPath() {

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ module.exports = {
9797
EXPORT_BUCKET_URL: null,
9898
HONEYBADGER_API_KEY: null,
9999
HONEYBADGER_REVISION: null,
100+
KEYCLOAK_URL: null,
100101
}),
101102
],
102103
devtool: "source-map",

0 commit comments

Comments
 (0)