Improvements docker image building
This commit is contained in:
parent
fad3a4d07c
commit
2771fed341
6 changed files with 24 additions and 16 deletions
|
@ -7,7 +7,7 @@ stages:
|
|||
#- integrationtest
|
||||
|
||||
.img: &img
|
||||
image: "domaindrivenarchitecture/ddadevops-dind:4.10.0"
|
||||
image: "domaindrivenarchitecture/ddadevops-dind:4.10.5"
|
||||
services:
|
||||
- docker:dind
|
||||
before_script:
|
||||
|
@ -17,7 +17,7 @@ stages:
|
|||
- export IMAGE_TAG=$CI_COMMIT_TAG
|
||||
|
||||
.cljs-job: &cljs
|
||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0"
|
||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
|
||||
cache:
|
||||
key: ${CI_COMMIT_REF_SLUG}
|
||||
paths:
|
||||
|
@ -30,7 +30,7 @@ stages:
|
|||
- npm install
|
||||
|
||||
.clj-job: &clj
|
||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.0"
|
||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.5"
|
||||
cache:
|
||||
key: ${CI_COMMIT_REF_SLUG}
|
||||
paths:
|
||||
|
|
|
@ -2,4 +2,4 @@ FROM domaindrivenarchitecture/dda-backup:latest
|
|||
|
||||
# Prepare Entrypoint Script
|
||||
ADD resources /tmp
|
||||
RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh
|
||||
RUN /tmp/install.sh
|
||||
|
|
|
@ -2,12 +2,20 @@
|
|||
|
||||
set -exo pipefail
|
||||
|
||||
install -m 0700 /tmp/entrypoint.sh /
|
||||
install -m 0700 /tmp/entrypoint-start-and-wait.sh /
|
||||
function main() {
|
||||
{
|
||||
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/backup.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/start-maintenance.sh /usr/local/bin/
|
||||
install -m 0700 /tmp/end-maintenance.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/restore.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/end-maintenance.sh /usr/local/bin/
|
||||
cleanupDocker
|
||||
} > /dev/null
|
||||
}
|
||||
|
||||
source /tmp/install_functions_debian.sh
|
||||
main
|
||||
|
|
|
@ -2,7 +2,7 @@ FROM nextcloud:27
|
|||
|
||||
# Prepare Entrypoint Script
|
||||
ADD resources /tmp
|
||||
RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh
|
||||
RUN /tmp/install.sh
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["apache2-foreground"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -eux pipefail
|
||||
set -exo pipefail
|
||||
|
||||
# version_greater A B returns whether A > B
|
||||
version_greater() {
|
||||
|
|
|
@ -16,5 +16,5 @@ function main() {
|
|||
cleanupDocker
|
||||
}
|
||||
|
||||
source /tmp/install_functions.sh
|
||||
main
|
||||
source /tmp/install_functions_debian.sh
|
||||
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
|
Loading…
Reference in a new issue