Compare commits
3 Commits
master
...
bvander/on
Author | SHA1 | Date | |
---|---|---|---|
a87238010d | |||
e76fb9fb10 | |||
da98b22ad1 |
@ -29,4 +29,7 @@ RUN chmod 755 ./db.sh
|
||||
RUN alias tsc=node_modules/typescript/bin/tsc
|
||||
COPY docker/start_server.sh ./start_server.sh
|
||||
RUN chmod 755 ./start_server.sh
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
ENTRYPOINT ["sh", "./start_server.sh"]
|
||||
|
@ -33,7 +33,9 @@ then
|
||||
else
|
||||
python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$IMPORT_DIR"
|
||||
fi
|
||||
|
||||
echo "Waiting for import balance job to complete ..."
|
||||
|
||||
tail --pid="$IMPORT_BALANCE_JOB" -f /dev/null
|
||||
set -e
|
||||
echo "Importing pins"
|
||||
|
66
docker-compose.auth.yml
Normal file
66
docker-compose.auth.yml
Normal file
@ -0,0 +1,66 @@
|
||||
services:
|
||||
|
||||
cic-frontend-auth:
|
||||
networks:
|
||||
- traefik
|
||||
image: localhost:5000/cic-auth-proxy:latest
|
||||
ports:
|
||||
- 8080
|
||||
environment:
|
||||
GPG_TRUSTED_PUBLICKEY_FINGERPRINT: CCE2E1D2D0E36ADE0405E2D0995BB21816313BD5
|
||||
GPG_IMPORT_DIR: /usr/src/cic-auth-proxy/meta/tests/testdata/dev/
|
||||
GPG_PUBLICKEY_FILENAME: publickeys.asc
|
||||
GPG_SIGNATURE_FILENAME: signature.asc
|
||||
PROXY_HOST: cic-meta-server
|
||||
PROXY_PORT: 80
|
||||
PROXY_PROTO: http
|
||||
PROXY_PATH_PREFIX: "/"
|
||||
HOMEDIR: .gnupg
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
|
||||
cic-meta-server:
|
||||
networks:
|
||||
- traefik
|
||||
- default
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.cic-meta-server.rule=Path(`/protected`)"
|
||||
- "traefik.http.routers.cic-meta-server.middlewares=cic-auth"
|
||||
- "traefik.http.middlewares.cic-auth.forwardauth.address=http://cic-frontend-auth/"
|
||||
- "traefik.http.middlewares.cic-auth.forwardauth.authRequestHeaders=Authorization"
|
||||
|
||||
proxy:
|
||||
networks:
|
||||
- traefik
|
||||
image: traefik:v2.5
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
ports:
|
||||
- "80:80"
|
||||
- "8080:8080"
|
||||
command:
|
||||
# Enable Docker in Traefik, so that it reads labels from Docker services
|
||||
- --providers.docker
|
||||
# Add a constraint to only use services with the label for this stack
|
||||
# Do not expose all Docker services, only the ones explicitly exposed
|
||||
- --providers.docker.exposedbydefault=false
|
||||
- "--providers.docker.network=traefik"
|
||||
# Disable Docker Swarm mode for local development
|
||||
# - --providers.docker.swarmmode
|
||||
# Enable the access log, with HTTP requests
|
||||
- --accesslog
|
||||
# - log.level=DEBUG
|
||||
# Enable the Traefik log, for configurations and errors
|
||||
- --log
|
||||
- --log.level=DEBUG
|
||||
# Enable the Dashboard and API
|
||||
- --api
|
||||
# Enable the Dashboard and API in insecure mode for local development
|
||||
- --api.insecure=true
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
|
||||
networks:
|
||||
traefik:
|
||||
name: "traefik"
|
@ -117,6 +117,7 @@ services:
|
||||
volumes:
|
||||
- contract-config:/tmp/cic/config
|
||||
|
||||
|
||||
cic-cache-tracker:
|
||||
image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-cache:${TAG:-latest}
|
||||
profiles:
|
||||
|
Loading…
Reference in New Issue
Block a user