Add coordinator image to compose (#48)

* Add coordinator image to compose

* Update ffmpeg

* Fix movie builder permissions

* Print container logs

* fix movie dockerfile typo

* remove cli, update containers

* Update CI

* Allow setting hostnames from environment

* Add .env to gitignore

* Setup .env in workflow

* Enable mod rewrite in web

* Update apache ver

* Remove stale test

* Delete removed test

* Fix typo

* update readme

.env.example

@@ -0,0 +1,4 @@
+# Hostname to use in helioviewer configuration
+HV_HOST=localhost
+API_PORT=8081
+CLIENT_PORT=8080

.github/workflows/build-check.yml

@@ -13,6 +13,9 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - name: Setup environment
+        run: mv .env.example .env
+
       - name: Build containers
         run: docker compose build
 
@@ -34,8 +37,15 @@ jobs:
       - name: Check that containers start and become healthy
         run: docker compose up -d --wait
 
+      - name: Print logs
+        if: always()
+        run: |
+          docker logs helioviewer-api-1
+          docker logs helioviewer-web-1
+          docker logs helioviewer-database-1
+          docker logs helioviewer-movies-1
+
       - name: Test Helioviewer environment
         run: |
-          bash tests/test_hgs2hpc_restarts.sh
           bash tests/test_make_movie.sh
           bash tests/test_aia_images.sh

.github/workflows/push-to-hub.yml

@@ -14,6 +14,9 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - name: Setup environment
+        run: mv .env.example .env
+
       - name: Build containers
         run: docker compose build
 

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .devcontainer
 test_setup_done
-secrets
+secrets
+.env

README.md

@@ -9,12 +9,18 @@ Once installed clone this repo and run docker compose:
 ```bash
 git clone --recurse-submodules https://github.com/Helioviewer-Project/helioviewer.org-docker.git
 cd helioviewer.org-docker
+mv .env.example .env
 docker compose up -d --wait
 ```
 
 It may take a while for the containers to be built and the application to start up.
 Once the output from docker settles down, check that it's running by going to http://localhost:8080/
 
+## Configuration
+
+Configuration is made via the `.env` file. By default this is set to
+bind and run everything on localhost. You can change this by editing `.env`
+
 # Testing
 For contributors to this environment, you can write tests to verify that the
 Helioviewer environment is working. The `tests` folder contains scripts that

compose.yaml

@@ -1,7 +1,9 @@
 name: helioviewer
 services:
   database:
-    image: mariadb
+    image: dgarciabriseno/helioviewer-db-dev
+    build:
+      dockerfile: ./compose/dockerfiles/db.Dockerfile
     environment:
       MARIADB_ROOT_PASSWORD: helioviewer
     ports:
@@ -12,20 +14,28 @@ services:
       interval: 5s
       timeout: 5s
       retries: 3
+    volumes:
+      - jp2_volume:/tmp/jp2
   redis:
     image: redis
     ports:
       - 6379:6379
     restart: on-failure
+  # Supporting python api for the helioviewer api
+  coordinator:
+    image: dgarciabriseno/hv-coordinator:0.1.0
   api:
+    env_file:
+      - .env
     image: dgarciabriseno/helioviewer-api-dev
     build:
       dockerfile: ./compose/dockerfiles/api_server.Dockerfile
     ports:
-      - 8081:80
+      - ${API_PORT}:80
     depends_on:
       - database
       - redis
+      - coordinator
     restart: on-failure
     platform: linux/amd64
     healthcheck:
@@ -45,11 +55,13 @@ services:
         target: /var/www/api.helioviewer.org
       - api_logs:/var/www/api.helioviewer.org/log
   web:
+    env_file:
+      - .env
     image: dgarciabriseno/helioviewer-web-dev
     build:
       dockerfile: ./compose/dockerfiles/webserver.Dockerfile
     ports:
-      - 8080:80
+      - ${CLIENT_PORT}:80
     depends_on:
       - api
     restart: on-failure
@@ -77,27 +89,6 @@ services:
         target: /var/www/api.helioviewer.org
       - jp2_volume:/tmp/jp2
       - cache:/var/www/helioviewer.org/cache
-  cli:
-    image: dgarciabriseno/helioviewer-cli-dev
-    build:
-      dockerfile: ./compose/dockerfiles/cli.Dockerfile
-    depends_on:
-      database:
-        condition: service_healthy
-    platform: linux/x86_64
-    healthcheck:
-      # Check every 10 seconds, wait up to 2 minutes
-      test: ["CMD", "ls", "/tmp/jp2/LASCO-C2/2023/12/01/white-light/"]
-      interval: 10s
-      timeout: 1s
-      retries: 12
-    volumes:
-      - type: volume
-        source: jp2_volume
-        target: /tmp/jp2
-      - type: bind
-        source: ./api
-        target: /home/admin/api
 
 volumes:
   jp2_volume: