diff --git a/Dockerfile b/Dockerfile index 5c8656b..1bd0777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,7 +110,7 @@ RUN set -eux; \ WORKDIR /var/www/html -COPY scripts /var/scripts +COPY scripts/chevereto /var/scripts RUN chmod +x \ /var/scripts/demo-importing.sh \ diff --git a/Makefile b/Makefile index eedec23..869219a 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ DOCKER_COMPOSE = $(shell ${ACME_CHALLENGE} echo @CONTAINER_BASENAME=\${CONTAINER # Informational feedback: - @./scripts/logo.sh + @./scripts/chevereto/logo.sh @echo "${FEEDBACK}" feedback--short: @@ -87,7 +87,7 @@ feedback--namespace: image: feedback--image feedback--short @LICENSE=${LICENSE} \ VERSION=${VERSION} \ - ./scripts/chevereto.sh + ./scripts/system/chevereto.sh @echo "* Building image ${IMAGE_TAG}" @docker build . \ --network host \ @@ -137,26 +137,26 @@ run: feedback bash /var/scripts/${SCRIPT}.sh cron: - @./scripts/cron.sh + @./scripts/system/cron.sh -cron-run: - @./scripts/cron-run.sh +cron--run: + @./scripts/system/cron--run.sh cloudflare: - @./scripts/cloudflare.sh + @./scripts/system/cloudflare.sh encryption-key: @openssl rand -base64 32 .PHONY: namespace namespace: - @chmod +x ./scripts/namespace.sh + @chmod +x ./scripts/system/namespace.sh @NAMESPACE=${NAMESPACE} \ NAMESPACE_EXISTS=${NAMESPACE_EXISTS} \ NAMESPACE_FILE=${NAMESPACE_FILE} \ HOSTNAME=${HOSTNAME} \ ENCRYPTION_KEY=${ENCRYPTION_KEY} \ - ./scripts/namespace.sh + ./scripts/system/namespace.sh # Docker compose diff --git a/scripts/chevereto/demo-importing.sh b/scripts/chevereto/demo-importing.sh new file mode 100755 index 0000000..071f69b --- /dev/null +++ b/scripts/chevereto/demo-importing.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -e +PACKAGE=/var/www/html/importing/importing.tar.gz +IMPORTING=/var/www/html/importing/ +curl -S -o ${PACKAGE} -L "https://codeload.github.com/chevereto/demo-importing/tar.gz/refs/heads/main" +tar -xf ${PACKAGE} -C ${IMPORTING} && + rm -rf ${PACKAGE} && + rsync -a ${IMPORTING}demo-importing-main/ ${IMPORTING} && + rm -rf ${IMPORTING}demo-importing-main +chown www-data: ${IMPORTING} -R diff --git a/scripts/logo.sh b/scripts/chevereto/logo.sh similarity index 100% rename from scripts/logo.sh rename to scripts/chevereto/logo.sh diff --git a/scripts/observe.sh b/scripts/chevereto/observe.sh similarity index 100% rename from scripts/observe.sh rename to scripts/chevereto/observe.sh diff --git a/scripts/sync.sh b/scripts/chevereto/sync.sh similarity index 100% rename from scripts/sync.sh rename to scripts/chevereto/sync.sh diff --git a/scripts/demo-importing.sh b/scripts/demo-importing.sh deleted file mode 100755 index d57a939..0000000 --- a/scripts/demo-importing.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -e -curl -S -o /var/www/html/importing/importing.tar.gz -L "https://codeload.github.com/chevereto/demo-importing/tar.gz/refs/heads/main" - -tar -xf /var/www/html/importing/importing.tar.gz -C /var/www/html/importing/ && - rm -rf /var/www/html/importing/importing.tar.gz && - rsync -a /var/www/html/importing/demo-importing-main/ /var/www/html/importing/ && - rm -rf /var/www/html/importing/demo-importing-main - -chown www-data: /var/www/html/importing/ -R diff --git a/scripts/os/ubuntu/22.04/install-docker.sh b/scripts/os/ubuntu/22.04/install-docker.sh new file mode 100644 index 0000000..4c304bc --- /dev/null +++ b/scripts/os/ubuntu/22.04/install-docker.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e +sudo apt-get remove -qq -y docker docker-engine docker.io containerd runc +sudo apt-get update -qq -y +sudo apt-get install -qq -y \ + ca-certificates \ + curl \ + gnupg \ + lsb-release +sudo mkdir -p /etc/apt/keyrings +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg +echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null +sudo apt-get update -qq -y +sudo apt-get install -qq -y docker-ce docker-ce-cli containerd.io docker-compose-plugin diff --git a/scripts/chevereto.sh b/scripts/system/chevereto.sh similarity index 100% rename from scripts/chevereto.sh rename to scripts/system/chevereto.sh diff --git a/scripts/cloudflare.sh b/scripts/system/cloudflare.sh similarity index 100% rename from scripts/cloudflare.sh rename to scripts/system/cloudflare.sh diff --git a/scripts/cron-run.sh b/scripts/system/cron--run.sh similarity index 100% rename from scripts/cron-run.sh rename to scripts/system/cron--run.sh diff --git a/scripts/cron.sh b/scripts/system/cron.sh similarity index 63% rename from scripts/cron.sh rename to scripts/system/cron.sh index f5661c7..446edae 100755 --- a/scripts/cron.sh +++ b/scripts/system/cron.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash set -e PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -CRON_FILE=/etc/cron.d/chevereto +CRON_FILE=/Users/rodolfo/git/chevereto/docker/chevereto.e cat >${CRON_FILE} </dev/null 2>&1 +* * * * * ${USER} ${PROJECT_DIR}/cron--run.sh >/dev/null 2>&1 45 2 * * * ${USER} ${PROJECT_DIR}/cloudflare.sh >/dev/null 2>&1 EOM echo ${CRON_FILE} diff --git a/scripts/namespace.sh b/scripts/system/namespace.sh similarity index 100% rename from scripts/namespace.sh rename to scripts/system/namespace.sh