Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Switch to generic health authority UI
Browse files Browse the repository at this point in the history
  • Loading branch information
jopereira committed Jun 15, 2020
1 parent a35d0b4 commit 48c3db9
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "frontend/CovidCode-UI"]
path = frontend/CovidCode-UI
url = https://github.com/admin-ch/CovidCode-UI.git
[submodule "authcodews/CovidCode-Service"]
path = authcodews/CovidCode-Service
url = https://github.com/admin-ch/CovidCode-Service.git
[submodule "backendws/dp3t-sdk-backend"]
path = backendws/dp3t-sdk-backend
url = https://github.com/DP-3T/dp3t-sdk-backend.git
[submodule "frontend/authcode-ui"]
path = frontend/authcode-ui
url = https://github.com/stayawayinesctec/authcode-ui.git
1 change: 1 addition & 0 deletions frontend/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
README.md
.git
.gitignore
1 change: 0 additions & 1 deletion frontend/CovidCode-UI
Submodule CovidCode-UI deleted from 9fe0c0
11 changes: 6 additions & 5 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ FROM node:14 as build
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH

COPY CovidCode-UI/package.json /app/package.json
COPY authcode-ui/package.json /app/package.json
RUN npm install
RUN npm install -g @angular/[email protected]
COPY CovidCode-UI/. /app
COPY environment.prod.ts src/environments/
RUN ng build --output-path=dist --configuration=production

COPY authcode-ui/. /app
COPY env /app/.env
RUN npm run generate

FROM library/caddy:alpine

WORKDIR /app

COPY --from=build /app/dist .
RUN rm /app/README.md
COPY Caddyfile /etc/caddy/Caddyfile
1 change: 1 addition & 0 deletions frontend/authcode-ui
Submodule authcode-ui added at c0b82a
2 changes: 2 additions & 0 deletions frontend/env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
KEYCLOAK_URL=https://localhost
AUTHCODE_URL=https://localhost
6 changes: 3 additions & 3 deletions keycloak/create.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

BAG_URL="https://localhost"
BAG_NAME="CovidCode FOPH"
BAG_NAME="Health Authority"

function setup_bagpts() {
KCADM=/opt/jboss/keycloak/bin/kcadm.sh
Expand All @@ -10,7 +10,7 @@ function setup_bagpts() {
echo "Waiting for server startup..."
while ! curl -s http://localhost:8080/auth -o /dev/null; do sleep 5; done

echo "KeyCloak configuration for CovidCode BAG starting..."
echo "KeyCloak configuration for ${BAG_NAME} starting..."
$KCADM config credentials --server http://localhost:8080/auth \
--realm master --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD

Expand Down Expand Up @@ -72,7 +72,7 @@ function setup_bagpts() {
echo "Added user $uid"
fi

echo "KeyCloak configuration for CovidCode BAG done."
echo "KeyCloak configuration for ${BAG_NAME} done."

# Bye bye...
rm -f /opt/jboss/.keycloak/kcadm.config
Expand Down
2 changes: 1 addition & 1 deletion tests/post.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

if [ $# -lt 3 ]; then
if [ $# -lt 2 ]; then
echo $0 "yyyy-mm-dd code"
exit 1
fi
Expand Down

0 comments on commit 48c3db9

Please sign in to comment.