diff --git a/README.md b/README.md index a2503a6..7b9bfb1 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,6 @@ For the Docker image that serves as a Web socket API and runs the BattMo.jl pack docker pull ghcr.io/battmoteam/battmoapp_api:latest ``` -And for the production server Nginx: - -``` -docker pull ghcr.io/battmoteam/battmogui_nginx:latest -``` - Run the images in containers by using a docker compose file. Create a docker-compose.yml file with the following content: ``` @@ -58,18 +52,6 @@ services: - "8080:8080" command: julia --project=. -e 'include("api.jl")' --color=yes --depwarn=no --project=@. --sysimage="pre-compilation/sysimage.so" -q -i -- $$(dirname $$0)/../bootstrap.jl -s=true "$$@" - nginx: - image: ghcr.io/battmoteam/battmoapp_nginx:latest - build: ./nginx - container_name: nginx - restart: always - ports: - - "8001:8001" - - "8002:8002" - depends_on: - - api - - gui - gui: image: ghcr.io/battmoteam/battmoapp_gui:latest build: ./gui diff --git a/docker-compose.yml b/docker-compose.yml index 73de8fb..6a443fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,20 +21,7 @@ services: # command: julia --project=. -e 'include("api.jl")' --color=yes --depwarn=no --project=@. --sysimage="pre-compilation/sysimage.so" -q -i -- $$(dirname $$0)/../bootstrap.jl -s=true "$$@" command: julia --project=. -e 'include("api.jl")' - - nginx: - build: ./nginx - container_name: nginx - restart: always - ports: - - "8001:8001" - - "8002:8002" - volumes: - - ./nginx:/app - depends_on: - - api - - gui gui: build: ./gui diff --git a/gui/output_files/battmo_results.hdf5 b/gui/output_files/battmo_results.hdf5 index 77cd51a..c98708e 100644 Binary files a/gui/output_files/battmo_results.hdf5 and b/gui/output_files/battmo_results.hdf5 differ diff --git a/nginx/Dockerfile b/nginx/Dockerfile index f85e440..d5e4e36 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -11,6 +11,10 @@ RUN mkdir -p /usr/share/nginx/html/.well-known/acme-challenge && \ chown -R www-data:www-data /usr/share/nginx/html/.well-known && \ chmod -R 755 /usr/share/nginx/html/.well-known +# Change ownership and permissions for the relevant directories +RUN chown -R www-data:www-data /etc/letsencrypt /usr/share/nginx/html && \ + chmod -R 755 /etc/letsencrypt /usr/share/nginx/html + # Remove default Nginx configuration files RUN rm /etc/nginx/nginx.conf RUN rm /etc/nginx/conf.d/default.conf @@ -22,3 +26,5 @@ COPY project.conf /etc/nginx/conf.d/ # Copy SSL certificate renewal script COPY renew-certs.sh /renew-certs.sh RUN chmod +x /renew-certs.sh + +