align database

.env

@@ -1,8 +1,8 @@
 TZ=Europe/Amsterdam
-WP_HOST=localhost
+WP_HOST=localhost:8000
 WP_DB_USER=civi
 WP_DB_PASSWORD=password123
-WP_DB_NAME=civi_wp
+WP_DB_NAME=civi_crm
 CIVI_DB_NAME=civi_crm
 WP_ADMIN_USER=civi
 WP_ADMIN_PASSWORD=password123

Dockerfile

@@ -1,4 +1,5 @@
 FROM wordpress:6.1.0-php7.4-fpm
+
 COPY custom.ini $PHP_INI_DIR/conf.d/
 
 ENV WP_VERSION=6.1.0

docker-compose.yml

@@ -2,9 +2,7 @@ version: "3.1"
 
 services:
   civi:
-    image: bij1-civi:latest
-    build:
-      context: ./wp
+    image: civicrm:latest
     volumes:
       - civi-data:/var/www/civi
     ports:
@@ -37,7 +35,7 @@ services:
   webserver:
     image: nginx:latest
     ports:
-      - 80:80
+      - 8000:80
     volumes:
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
       - civi-data:/var/www/civi

image.sh

@@ -25,9 +25,10 @@ export TAG_VERSION="$DOCKER_REGISTRY/$DOCKER_IMAGE"
 export TAG_LATEST="$DOCKER_REGISTRY/${PROJECT}:latest"
 
 build() {
-	docker build --file ./Dockerfile --cache-from ${CACHE_FROM} --tag ${DOCKER_IMAGE} .
+	docker build --file ./Dockerfile --tag ${DOCKER_IMAGE} .
 	docker tag $DOCKER_IMAGE $TAG_VERSION
 	docker tag $DOCKER_IMAGE $TAG_LATEST
+	docker tag $DOCKER_IMAGE $PROJECT:latest
 }
 
 push() {