From: William Desportes Date: Tue, 17 Aug 2021 12:25:13 +0000 (+0200) Subject: Drop TravisCI and hooks X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=cf012908cb840a14be88be55acc4b8bb9462ff3e;p=roundcube-roundcubemail-docker.git Drop TravisCI and hooks --- diff --git a/apache/docker-compose.yml b/apache/docker-compose.yml deleted file mode 100644 index bbbdbe6..0000000 --- a/apache/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "2" - -services: - roundcubemail: - build: ./ - container_name: roundcubemail - depends_on: - - roundcubedb - links: - - roundcubedb - ports: - - 80:80 - volumes: - - /srv/roundcube/html:/var/www/html - environment: - - ROUNDCUBEMAIL_DB_TYPE=mysql - - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as mysql container name - - ROUNDCUBEMAIL_DB_NAME=roundcube # same as mysql MYSQL_DATABASE env name - - ROUNDCUBEMAIL_DB_USER=roundcube # same as mysql MYSQL_USER env name - - ROUNDCUBEMAIL_DB_PASSWORD=roundcubedbpass # same as mysql MYSQL_PASSWORD env name - - roundcubedb: - image: mariadb:latest - container_name: roundcubedb - command: --character_set_client=utf8 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --character-set-client-handshake=FALSE - ports: - - 3306:3306 - volumes: - - /srv/roundcube/db:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=mysqlrootpassword - - MYSQL_DATABASE=roundcube - - MYSQL_USER=roundcube - - MYSQL_PASSWORD=roundcubedbpass diff --git a/apache/hooks b/apache/hooks deleted file mode 120000 index f631275..0000000 --- a/apache/hooks +++ /dev/null @@ -1 +0,0 @@ -../hooks \ No newline at end of file diff --git a/fpm-alpine/docker-compose.yml b/fpm-alpine/docker-compose.yml deleted file mode 100644 index eae40ad..0000000 --- a/fpm-alpine/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: "2" - -services: - roundcubemail: - build: ./ - container_name: roundcubemail - depends_on: - - roundcubedb - links: - - roundcubedb - ports: - - 9000:9000 - volumes: - - /srv/roundcube/html:/var/www/html - environment: - - ROUNDCUBEMAIL_DB_TYPE=pgsql - - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as pgsql container name - - ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name - - ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name - - ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name - - roundcubedb: - image: postgres:alpine - container_name: roundcubedb - ports: - - 5432:5432 - volumes: - - /srv/roundcube/db:/var/lib/postgresql/data - environment: - - POSTGRES_DB=roundcube - - POSTGRES_USER=roundcube - - POSTGRES_PASSWORD=roundcube - - roundcubenginx: - image: nginx:latest - container_name: roundcubenginx - ports: - - 80:80 - depends_on: - - roundcubemail - links: - - roundcubemail - volumes: - - /srv/roundcube/html:/var/www/html - environment: - - NGINX_HOST=localhost # set your local domain or your live domain diff --git a/fpm-alpine/hooks b/fpm-alpine/hooks deleted file mode 120000 index f631275..0000000 --- a/fpm-alpine/hooks +++ /dev/null @@ -1 +0,0 @@ -../hooks \ No newline at end of file diff --git a/fpm/docker-compose.yml b/fpm/docker-compose.yml deleted file mode 100644 index 3524216..0000000 --- a/fpm/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: "2" - -services: - roundcubemail: - build: ./ - container_name: roundcubemail - depends_on: - - roundcubedb - links: - - roundcubedb - ports: - - 9000:9000 - volumes: - - /srv/roundcube/html:/var/www/html - environment: - - ROUNDCUBEMAIL_DB_TYPE=pgsql - - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as pgsql container name - - ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name - - ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name - - ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name - - roundcubedb: - image: postgres:latest - container_name: roundcubedb - ports: - - 5432:5432 - volumes: - - /srv/roundcube/db:/var/lib/postgresql/data - environment: - - POSTGRES_DB=roundcube - - POSTGRES_USER=roundcube - - POSTGRES_PASSWORD=roundcube - - roundcubenginx: - image: nginx:latest - container_name: roundcubenginx - ports: - - 80:80 - depends_on: - - roundcubemail - links: - - roundcubemail - volumes: - - /srv/roundcube/html:/var/www/html - environment: - - NGINX_HOST=localhost # set your local domain or your live domain diff --git a/fpm/hooks b/fpm/hooks deleted file mode 120000 index f631275..0000000 --- a/fpm/hooks +++ /dev/null @@ -1 +0,0 @@ -../hooks \ No newline at end of file diff --git a/hooks/post_build b/hooks/post_build deleted file mode 100755 index 23a078e..0000000 --- a/hooks/post_build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e - -tagStart=$(echo $IMAGE_NAME | awk '{print index($1,":")}') -repoName=${IMAGE_NAME:0:tagStart-1} -tagName=${IMAGE_NAME:tagStart:99} - -if [ "$tagName" = "latest-apache" ]; then - echo "Tagging $IMAGE_NAME as :latest" - - docker tag $IMAGE_NAME ${repoName}:latest - docker push ${repoName}:latest -fi diff --git a/update.sh b/update.sh index 2fd6b2f..6de65bd 100755 --- a/update.sh +++ b/update.sh @@ -24,7 +24,6 @@ VERSION="${1:-$(curl -fsS https://roundcube.net/VERSION.txt)}" #set -x echo "Generating files for version $VERSION..." -travisEnv= for variant in apache fpm fpm-alpine; do dir="$variant" mkdir -p "$dir" @@ -40,10 +39,6 @@ for variant in apache fpm fpm-alpine; do ' $template | tr '¬' '\n' > "$dir/Dockerfile" echo "✓ Wrote $dir/Dockerfile" - - travisEnv+='¬ - VERSION='"$VERSION"' VARIANT='"$variant" done -sed -E -e 's/%%ENV%%/'"$travisEnv"'/;' templates/travis.yml | tr '¬' '\n' > .travis.yml - echo "Done."