Skip to content

Commit 1915e6e

Browse files
committed
Add secret receiver entrypoint
1 parent 6680f0b commit 1915e6e

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/aou-sas/.devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SAS App for AoU",
3-
"dockerComposeFile": ["docker-compose.yaml", "../aou-common/aou-common-compose.yaml"],
3+
"dockerComposeFile": ["docker-compose.yaml", "../common/common-compose.yaml", "../aou-common/aou-common-compose.yaml"],
44
"service": "app",
55
"runServices": ["app", "wondershaper"],
66
"shutdownAction": "none",

src/aou-sas/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ RUN PROXY_CONF=/etc/httpd/conf.d/dkrapro-proxy.conf && \
7474

7575
# Wrapper entrypoint: copies the SAS license from Mikey Secrets (if active)
7676
# to /sasinside/ before handing off to the SAS entrypoint.
77+
COPY --from=wb-secret-receiver /dist/wb-secret-receiver /wb-secret-receiver
7778
COPY sas-entrypoint.sh /opt/sas/aou/sas-entrypoint.sh
7879
RUN chmod +x /opt/sas/aou/sas-entrypoint.sh
79-
ENTRYPOINT ["/opt/sas/aou/sas-entrypoint.sh"]
80+
ENTRYPOINT ["/wb-secret-receiver", "/opt/sas/aou/sas-entrypoint.sh"]

src/aou-sas/docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
include:
2+
- ../common/common-compose.yaml
23
- ../aou-common/aou-common-compose.yaml
34
services:
45
app:
56
container_name: "application-server"
67
build:
78
context: .
89
additional_contexts:
10+
wb-secret-receiver: service:common-secret-receiver-builder
911
load-envs: service:aou-common-load-envs
1012
restart: always
1113
ports:

0 commit comments

Comments
 (0)