From c86a0391aa6a399f90ede2cb4f234355a638afe6 Mon Sep 17 00:00:00 2001 From: Michael Traeger Date: Thu, 28 Mar 2019 16:38:12 +0100 Subject: [PATCH] examples --- .gitignore | 2 ++ docker-compose.yml | 3 +- sample/http/docker-compose.yml | 3 +- sample/nextcloud/docker-compose.yml | 35 ++++++++++++++++++++++++ sample/nextcloud/docker.env | 0 sample/withDockerfile/docker-compose.yml | 22 +++++++++++++++ sample/withDockerfile/docker.env | 0 sample/withDockerfile/docker/Dockerfile | 7 +++++ 8 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 sample/nextcloud/docker-compose.yml create mode 100644 sample/nextcloud/docker.env create mode 100644 sample/withDockerfile/docker-compose.yml create mode 100644 sample/withDockerfile/docker.env create mode 100644 sample/withDockerfile/docker/Dockerfile diff --git a/.gitignore b/.gitignore index c18dd8d..a00aa6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ __pycache__/ +updates.json + diff --git a/docker-compose.yml b/docker-compose.yml index 1924db8..6feab06 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: image: docker.clkl.de/docker/update:0.1_alpine build: . volumes: - - /opt/docker/services:/services +# - /opt/docker/services:/services + - ./sample:/services - ./:/out/ command: bash -c 'python3 /out/show_updateable.py -s -o /out/updates.json /services/* --ignore zammad' diff --git a/sample/http/docker-compose.yml b/sample/http/docker-compose.yml index 7647ab5..c497d33 100644 --- a/sample/http/docker-compose.yml +++ b/sample/http/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: http: - image: httpd:alpine + image: httpd:2.4.32-alpine # ports: # - "80:80" volumes: @@ -17,3 +17,4 @@ networks: traefik_net: external: name: traefik_net + diff --git a/sample/nextcloud/docker-compose.yml b/sample/nextcloud/docker-compose.yml new file mode 100644 index 0000000..dcd9d11 --- /dev/null +++ b/sample/nextcloud/docker-compose.yml @@ -0,0 +1,35 @@ +version: '2' + +services: + cloud: + image: nextcloud:14.0.8-apache +# image: owncloud/server:10.0.8 + restart: on-failure:5 + depends_on: + - dbcloud + volumes: + - ./data:/files + - ./config:/var/www/html/config + - ./apps:/var/www/html/custom_apps + ports: + - "127.0.0.1:3020:80" + + + dbcloud: + image: mariadb:10.3.2 + restart: on-failure:5 + env_file: + - docker.env + environment: +# - MYSQL_ROOT_PASSWORD=VerySecurePassword +# - MYSQL_USER=cloud +# - MYSQL_PASSWORD=CorrectBatteryHorseStaple +# - MYSQL_DATABASE=cloud + - MYSQL_MAX_ALLOWED_PACKET=128M + - MYSQL_INNODB_LOG_FILE_SIZE=64M + - MYSQL_INNODB_LARGE_PREFIX=ON + - MYSQL_INNODB_FILE_FORMAT=Barracuda + volumes: + - ./mysql:/var/lib/mysql + + diff --git a/sample/nextcloud/docker.env b/sample/nextcloud/docker.env new file mode 100644 index 0000000..e69de29 diff --git a/sample/withDockerfile/docker-compose.yml b/sample/withDockerfile/docker-compose.yml new file mode 100644 index 0000000..816db3e --- /dev/null +++ b/sample/withDockerfile/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3" + +services: + someservice: + build: + context: ./docker/ + dockerfile: Dockerfile + ports: + - "8080:80" + restart: on-failure:5 + depends_on: + - dbsomeservice + + + dbsomeservice: + image: mariadb:10.3.2 + restart: on-failure:5 + env_file: + - docker.env + volumes: + - ./mysql:/var/lib/mysql + diff --git a/sample/withDockerfile/docker.env b/sample/withDockerfile/docker.env new file mode 100644 index 0000000..e69de29 diff --git a/sample/withDockerfile/docker/Dockerfile b/sample/withDockerfile/docker/Dockerfile new file mode 100644 index 0000000..e116a1f --- /dev/null +++ b/sample/withDockerfile/docker/Dockerfile @@ -0,0 +1,7 @@ +FROM alpine:3.6 + +EXPOSE 80 +RUN apk add --update python3 python3-dev git g++ nodejs-npm mariadb-dev mariadb-client-libs openldap-dev \ + && apk del nodejs-npm mariadb-dev git g++ python3-dev + +