From fd223635d3733d5cf0bbafc1904ddceac8417ef7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 16 Feb 2023 02:20:42 +0100 Subject: [PATCH] have things working in docker-compose --- deployment/build.docker.sh | 35 -------------- deployment/docker-compose.yml | 63 ++++++++++++++++++++------ deployment/src/docker/neo4j.Dockerfile | 14 ------ 3 files changed, 49 insertions(+), 63 deletions(-) delete mode 100755 deployment/build.docker.sh delete mode 100644 deployment/src/docker/neo4j.Dockerfile diff --git a/deployment/build.docker.sh b/deployment/build.docker.sh deleted file mode 100755 index 23a5cce21..000000000 --- a/deployment/build.docker.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - - -SCRIPT_PATH=$(realpath $0) -SCRIPT_DIR=$(dirname $SCRIPT_PATH) - - -# DOCKER_BUILDKIT=0 -# TODO this must be somehow defined as service within docker-compose and build order must be defined accordingly -#services: -# basething: -# image: unimportantlocalnameusedinfromstatement -# build: -# dockerfile: src/docker/baseimage -# target: production -# context: . -# command: sleep 60 -# webapp: -# image: myimage/webapp:local-production -# depends_on: -# - basething -# build: -# dockerfile: src/docker/webapp.Dockerfile -# target: production -# context: . - -# Webapp -docker build --target base -t "ocelotsocialnetwork/webapp:local-base" $SCRIPT_DIR/../webapp/ -docker build --target code -t "ocelotsocialnetwork/webapp:local-code" $SCRIPT_DIR/../webapp/ -# Backend -docker build --target base -t "ocelotsocialnetwork/backend:local-base" $SCRIPT_DIR/../backend/ -docker build --target code -t "ocelotsocialnetwork/backend:local-code" $SCRIPT_DIR/../backend/ -# Maintenance -docker build --target base -t "ocelotsocialnetwork/maintenance:local-base" $SCRIPT_DIR/../webapp/ -f $SCRIPT_DIR/../webapp/Dockerfile.maintenance -docker build --target code -t "ocelotsocialnetwork/maintenance:local-code" $SCRIPT_DIR/../webapp/ -f $SCRIPT_DIR/../webapp/Dockerfile.maintenance \ No newline at end of file diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 108e87bd3..923bd51c6 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -1,8 +1,19 @@ # This docker-compose file is just here for testing - version: "3.4" - services: + webapp-base: + image: ocelotsocialnetwork/webapp:local-base + build: + dockerfile: ../webapp/Dockerfile + context: ../webapp + target: base + + webapp-code: + image: ocelotsocialnetwork/webapp:local-code + build: + dockerfile: ../webapp/Dockerfile + context: ../webapp + target: code webapp: image: ocelotsocialnetwork/webapp-branded:local-production @@ -20,6 +31,8 @@ services: - test-network depends_on: - backend + - webapp-base + - webapp-code env_file: - .env environment: @@ -31,6 +44,20 @@ services: - INVITE_REGISTRATION=true - CATEGORIES_ACTIVE=true + backend-base: + image: ocelotsocialnetwork/backend:local-base + build: + dockerfile: ../backend/Dockerfile + context: ../backend + target: base + + backend-code: + image: ocelotsocialnetwork/backend:local-code + build: + dockerfile: ../backend/Dockerfile + context: ../backend + target: code + backend: image: ocelotsocialnetwork/backend-branded:local-production build: @@ -45,6 +72,8 @@ services: - test-network depends_on: - neo4j + - backend-base + - backend-code ports: - 4000:4000 volumes: @@ -68,6 +97,20 @@ services: - SMTP_PORT=25 - SMTP_IGNORE_TLS=true + maintenance-base: + image: ocelotsocialnetwork/maintenance:local-base + build: + dockerfile: ../webapp/Dockerfile.maintenance + context: ../webapp + target: base + + maintenance-code: + image: ocelotsocialnetwork/maintenance:local-code + build: + dockerfile: ../webapp/Dockerfile.maintenance + context: ../webapp + target: code + maintenance: # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there image: ocelotsocialnetwork/maintenance-branded:local-production @@ -82,19 +125,14 @@ services: - APP_IMAGE_TAG_CODE=local-code networks: - test-network + depends_on: + - maintenance-base + - maintenance-code ports: - 3001:80 - ######################################################## - # NEO4J ################################################ - ######################################################## neo4j: - # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there - image: ocelotsocialnetwork/neo4j-community-branded:local-production - build: - dockerfile: src/docker/neo4j.Dockerfile - target: community-branded - context: . + image: ocelotsocialnetwork/neo4j-community:latest networks: - test-network volumes: @@ -106,9 +144,6 @@ services: ports: - 7687:7687 - ######################################################## - # MAILSERVER TO FAKE SMTP ############################## - ######################################################## mailserver: image: djfarrelly/maildev ports: diff --git a/deployment/src/docker/neo4j.Dockerfile b/deployment/src/docker/neo4j.Dockerfile deleted file mode 100644 index eddc7be38..000000000 --- a/deployment/src/docker/neo4j.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -ARG APP_IMAGE=ocelotsocialnetwork/neo4j-community -ARG APP_IMAGE_TAG=latest -ARG APP_IMAGE_COMMUNITY=${APP_IMAGE}:${APP_IMAGE_TAG} - -################################################################################## -# COMMUNITY ###################################################################### -################################################################################## -FROM $APP_IMAGE_COMMUNITY as community-branded - -################################################################################## -# ENTERPRISE ##################################################################### -################################################################################## -# Todo: refactor this with 'APP_IMAGE', 'APP_IMAGE_TAG', and similar to 'APP_IMAGE_COMMUNITY', Neo4j 'dockerfile' from main code -FROM ocelotsocialnetwork/neo4j-enterprise:latest as enterprise-branded