meissa/c4k-nextcloud
6
0
Fork 0
Code Issues Pull requests Projects Releases 19 Packages Wiki Activity

Improvements docker image building

Browse source
This commit is contained in:
Mirco 2023-12-21 20:13:30 +01:00
parent fad3a4d07c
commit 2771fed341
6 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -7,7 +7,7 @@ stages:
#- integrationtest #- integrationtest
.img: &img .img: &img
image: "domaindrivenarchitecture/ddadevops-dind:4.10.0" image: "domaindrivenarchitecture/ddadevops-dind:4.10.5"
services: services:
- docker:dind - docker:dind
before_script: before_script:
@ -17,7 +17,7 @@ stages:
- export IMAGE_TAG=$CI_COMMIT_TAG - export IMAGE_TAG=$CI_COMMIT_TAG
.cljs-job: &cljs .cljs-job: &cljs
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0" image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
cache: cache:
key: ${CI_COMMIT_REF_SLUG} key: ${CI_COMMIT_REF_SLUG}
paths: paths:
@ -30,7 +30,7 @@ stages:
- npm install - npm install
.clj-job: &clj .clj-job: &clj
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0" image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
cache: cache:
key: ${CI_COMMIT_REF_SLUG} key: ${CI_COMMIT_REF_SLUG}
paths: paths:

2
infrastructure/backup/image/Dockerfile
View file

@ -2,4 +2,4 @@ FROM domaindrivenarchitecture/dda-backup:latest
# Prepare Entrypoint Script # Prepare Entrypoint Script
ADD resources /tmp ADD resources /tmp
RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh RUN /tmp/install.sh

24
infrastructure/backup/image/resources/install.sh
View file

@ -2,12 +2,20 @@
set -exo pipefail set -exo pipefail
install -m 0700 /tmp/entrypoint.sh / function main() {
install -m 0700 /tmp/entrypoint-start-and-wait.sh / {
install -m 0700 /tmp/entrypoint.sh /
install -m 0700 /tmp/entrypoint-start-and-wait.sh /
install -m 0700 /tmp/init.sh /usr/local/bin/ install -m 0700 /tmp/init.sh /usr/local/bin/
install -m 0700 /tmp/backup.sh /usr/local/bin/ install -m 0700 /tmp/backup.sh /usr/local/bin/
install -m 0700 /tmp/restore.sh /usr/local/bin/ install -m 0700 /tmp/restore.sh /usr/local/bin/
install -m 0700 /tmp/list-snapshots.sh /usr/local/bin/ install -m 0700 /tmp/list-snapshots.sh /usr/local/bin/
install -m 0700 /tmp/start-maintenance.sh /usr/local/bin/ install -m 0700 /tmp/start-maintenance.sh /usr/local/bin/
install -m 0700 /tmp/end-maintenance.sh /usr/local/bin/ install -m 0700 /tmp/end-maintenance.sh /usr/local/bin/
cleanupDocker
} > /dev/null
}
source /tmp/install_functions_debian.sh
main

2
infrastructure/nextcloud/image/Dockerfile
View file

@ -2,7 +2,7 @@ FROM nextcloud:27
# Prepare Entrypoint Script # Prepare Entrypoint Script
ADD resources /tmp ADD resources /tmp
RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh RUN /tmp/install.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

2
infrastructure/nextcloud/image/resources/entrypoint.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
set -eux pipefail set -exo pipefail
# version_greater A B returns whether A > B # version_greater A B returns whether A > B
version_greater() { version_greater() {

4
infrastructure/nextcloud/image/resources/install.sh
View file

@ -16,5 +16,5 @@ function main() {
cleanupDocker cleanupDocker
} }
source /tmp/install_functions.sh source /tmp/install_functions_debian.sh
main DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main