Merge pull request #395 from itsthejb/fix-tests

Fix test running

Dockerfile

@@ -68,9 +68,9 @@ ENV POSTGREY_TEXT="Delayed by postgrey"
 # --- prep
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 # --- set timezone and locale
-ENV LANG "${BUILD_LOCALE}.UTF-8"
-ENV LANGUAGE "${BUILD_LOCALE}:en"
-ENV LC_ALL "${BUILD_LOCALE}.UTF-8"
+ENV LANG="${BUILD_LOCALE}.UTF-8"
+ENV LANGUAGE="${BUILD_LOCALE}:en"
+ENV LC_ALL="${BUILD_LOCALE}.UTF-8"
 # hadolint ignore=SC1091
 RUN . /etc/os-release && \
     touch /etc/apt/sources.list && \
@@ -345,7 +345,7 @@ RUN cp -v /etc/passwd /etc/passwd.bootstrap && \
     mkdir -p /var/vmail && \
     tar -C /var/vmail -czf /bootstrap/vmail.tgz . && \
     tar -C /var/www -czf /bootstrap/www.tgz  .
-ENV TERM xterm
+ENV TERM=xterm
 
 RUN printf "export TERM=xterm\n" >> /root/.bashrc && \
 #

README.md

@@ -47,9 +47,9 @@ services:
 ```
 
 * Run the build
-  * `docker-compose build .`
-  * If using `extends`: `docker-compose -f docker-compose.build.yml build`
-* Start the container: `docker-compose up -d`
+  * `docker compose build .`
+  * If using `extends`: `docker compose -f docker-compose.build.yml build`
+* Start the container: `docker compose up -d`
 * Initally test the build by connecting to the ispconfig control panel: `http://<localhost>:8080`
 * Do addition verification!
 * Ideally, push your image to Docker Cloud

build/bin/track

@@ -6,7 +6,7 @@ echo "dfasf"
   rm -rf .git
   git init
   git add --all
-  git commit -m "docker-compose track : initial checkin" >/dev/null
+  git commit -m "docker compose track : initial checkin" >/dev/null
   exit 0
 fi
 

hooks/build

@@ -6,4 +6,4 @@ OPTIONS=()
 source "$DIR/pre_build"
 
 [ -t 1 ] && OPTIONS+=(--progress tty)
-docker-compose -f "$DIR/../build/docker-compose.build.yml" build "${OPTIONS[@]}" "$@"
+docker compose -f "$DIR/../build/docker-compose.build.yml" build "${OPTIONS[@]}" "$@"

hooks/pre_test

@@ -2,4 +2,4 @@
 if [ "$GITHUB_REF_NAME" = "master" ]; then exit 0; fi
 # shellcheck disable=SC1091
 source "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/pre_build"
-docker network create --driver=bridge --subnet=172.99.0.0/16 --ip-range=172.99.0.2/16 --gateway=172.99.0.1 -o 'com.docker.network.bridge.name'='test_shared' test_shared &> /dev/null || true
+docker network create --driver=bridge --subnet=172.99.0.0/16 --ip-range=172.99.0.0/16 --gateway=172.99.0.1 -o 'com.docker.network.bridge.name'='test_shared' test_shared

hooks/test

@@ -10,8 +10,8 @@ export CONTAINER="ispconfig-test"
 
 function buildAndTest() {
   YML=$1
-  UP="docker-compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
-  DOWN="docker-compose -f test/$YML down -v"
+  UP="docker compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
+  DOWN="docker compose -f test/$YML down -v"
 
   if ! $UP; then
     echo "Failed: \"$UP\""