Improvements docker image building

This commit is contained in:
Mirco 2023-12-07 21:54:20 +01:00
parent c931e36a0a
commit 7ccf587c00
14 changed files with 32 additions and 37 deletions

View file

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

View file

@ -1,6 +1,6 @@
#!/bin/bash
set -o pipefail
set -Eexo pipefail
function main() {

View file

@ -1,6 +1,6 @@
#!/bin/bash
set -x
set -exo pipefail
if test -f "/var/backups/config/config.orig"; then

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -exo pipefail
function main() {
file_env POSTGRES_DB
file_env POSTGRES_PASSWORD

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -Eexo pipefail
function main() {
file_env POSTGRES_DB
file_env POSTGRES_PASSWORD

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -Eexo pipefail
function main() {
file_env AWS_ACCESS_KEY_ID
file_env AWS_SECRET_ACCESS_KEY

View file

@ -1,5 +1,7 @@
#!/bin/bash
set -exo pipefail
install -m 0700 /tmp/entrypoint.sh /
install -m 0700 /tmp/entrypoint-start-and-wait.sh /

View file

@ -1,6 +1,6 @@
#!/bin/bash
set -o pipefail
set -exo pipefail
function list-snapshot-files() {
if [ -z ${CERTIFICATE_FILE} ];

View file

@ -1,6 +1,6 @@
#!/bin/bash
set -Eeox pipefail
set -Eexo pipefail
function main() {
local role_snapshot_id="${1:-latest}"

View file

@ -1,7 +1,5 @@
#!/bin/bash
set -x
if [ ! -f "/var/backups/config/config.orig" ]; then
rm -f /var/backups/config/config.orig

View file

@ -1,10 +0,0 @@
FROM c4k-cloud-backup
RUN apt update > /dev/null
RUN apt -yqq --no-install-recommends --yes install curl default-jre-headless > /dev/null
RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar
COPY serverspec.edn /tmp/serverspec.edn
RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v

View file

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

View file

@ -1,11 +1,20 @@
#!/bin/bash
set -Eeo pipefail
set -exo pipefail
apt update && apt -qqy install postgresql-client > /dev/null
function main() {
{
upgradeSystem
apt-get install -qqy ca-certificates curl gnupg postgresql-client
mkdir /var/data
} > /dev/null
mkdir /var/data
install -m 0700 /tmp/install-debug.sh /usr/local/bin/
install -m 0544 /tmp/upload-max-limit.ini /usr/local/etc/php/conf.d/
install -m 0544 /tmp/memory-limit.ini /usr/local/etc/php/conf.d/
install -m 0755 /tmp/entrypoint.sh /
cleanupDocker
}
install -m 0700 /tmp/install-debug.sh /usr/local/bin/
install -m 0544 /tmp/upload-max-limit.ini /usr/local/etc/php/conf.d/
install -m 0544 /tmp/memory-limit.ini /usr/local/etc/php/conf.d/
install -m 0755 /tmp/entrypoint.sh /
source /tmp/install_functions.sh
main

View file

@ -1,10 +0,0 @@
FROM c4k-cloud
RUN apt-get update
RUN apt-get -yqq install --no-install-recommends --yes curl default-jre-headless
RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar
COPY serverspec.edn /tmp/serverspec.edn
RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v