diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | auth-server-poc/Dockerfile | 5 | ||||
| -rwxr-xr-x | quickstart.sh | 10 |
3 files changed, 18 insertions, 10 deletions
@@ -50,7 +50,7 @@ Clone the repository. Install dependencies (Debian). - sudo apt install docker.io docker-compose + sudo apt install docker.io docker-compose jq curl apache2-utils Start the collector and JWT server, and generate certificates for JWT signing: @@ -81,6 +81,17 @@ We can also limit the number of results and skip N results forward with the para curl -s -H "Authorization: Bearer $JWT" 'http://localhost:80/sc/v0/get?limit=5&skip=2' | json_pp -json_opt utf8,pretty +## Development + +There are two docker-compose files used for development: + +- `docker/docker-compose-dev.yaml` for the collector, and +- `auth-server-poc/docker-compose.yml` for the JWT server. + +To apply changes, build with `docker-compose build -f docker/docker-compose-dev.yaml` or `docker-compose -f auth-server-poc/docker-compose.yml` (depending on what has changed) and then restart the containers with `./quickstart.sh`. + +If you want to save build time you can also pass a service name to `docker-compose build`, i.e. `docker-compose build -f docker/docker-compose-dev.yaml collector`. + ## JWT mechanics (work in progress) 2021-11-24: Currently no checks except that the JWT is valid are performed when diff --git a/auth-server-poc/Dockerfile b/auth-server-poc/Dockerfile index d2fbd28..60ccb8f 100644 --- a/auth-server-poc/Dockerfile +++ b/auth-server-poc/Dockerfile @@ -1,6 +1,7 @@ FROM debian:buster -COPY . /opt/auth-server-poc +RUN mkdir /opt/auth-server-poc +COPY requirements.txt setup.sh /opt/auth-server-poc/ RUN /opt/auth-server-poc/setup.sh # Prepare for supervisord, uwsgi, ngninx @@ -22,4 +23,6 @@ RUN chown www-data:www-data /opt/auth-server-poc # Expose HTTP EXPOSE 80 +COPY ./ /opt/auth-server-poc/ + ENTRYPOINT supervisord -c /etc/supervisor/supervisord.conf diff --git a/quickstart.sh b/quickstart.sh index 8da22e0..d46a791 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -21,6 +21,7 @@ fi # Generate new certificates to use for JWT. if [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/private.pem ] && [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/public.pem ]; then openssl ecparam -genkey -name prime256v1 -noout -out ${DOCKER_JWT_PUBKEY_PATH}/private.pem + chmod 644 ${DOCKER_JWT_PUBKEY_PATH}/private.pem openssl ec -in ${DOCKER_JWT_PUBKEY_PATH}/private.pem -pubout -out ${DOCKER_JWT_PUBKEY_PATH}/public.pem fi @@ -30,12 +31,5 @@ if [ ! -f ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd ]; then fi # Launch the containers. +docker-compose -f docker/docker-compose-dev.yaml up -d docker-compose -f auth-server-poc/docker-compose.yml up -d - -if [ "$1" = "dev" ]; then - echo "Using docker/docker-compose-dev.yaml" - docker-compose -f docker/docker-compose-dev.yaml build collector - docker-compose -f docker/docker-compose-dev.yaml up -d -else - docker-compose -f docker/docker-compose.yaml up -d -fi |