From db623eab10b85d287bb613f9ac6de3bcc85a9d88 Mon Sep 17 00:00:00 2001 From: casjay Date: Thu, 20 Oct 2022 15:57:13 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 128 +++++--- bin/entrypoint-bun.sh | 182 ----------- rootfs/usr/local/bin/entrypoint.sh | 283 ++++++++++++++++++ rootfs/usr/local/bin/start-bun.sh | 178 +++++++++++ .../share/template-files/config}/.gitkeep | 0 .../local/share/template-files/data}/.gitkeep | 0 .../share/template-files/defaults}/.gitkeep | 0 7 files changed, 543 insertions(+), 228 deletions(-) delete mode 100755 bin/entrypoint-bun.sh create mode 100755 rootfs/usr/local/bin/entrypoint.sh create mode 100755 rootfs/usr/local/bin/start-bun.sh rename {bin => rootfs/usr/local/share/template-files/config}/.gitkeep (100%) rename {config => rootfs/usr/local/share/template-files/data}/.gitkeep (100%) rename {data => rootfs/usr/local/share/template-files/defaults}/.gitkeep (100%) diff --git a/Dockerfile b/Dockerfile index fe196f5..eb27e57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,70 +1,106 @@ -FROM casjaysdevdocker/debian:latest as build +FROM casjaysdevdocker/debian:latest AS build -ARG TIMEZONE="America/New_York" \ - IMAGE_NAME="bun" \ - LICENSE="MIT" \ - DEBUG="" \ - PORTS="1-65535" +ARG DEBIAN_VERSION="bullseye" +ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" +ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config" +ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" +ARG PACK_LIST="bash sudo tini iproute2 unzip curl git" -ENV TZ="$TIMEZONE" \ - DEBUG="$DEBUG" \ - SHELL="/bin/bash" \ - ENV="$HOME/.bashrc" \ +ENV LANG=en_US.utf8 \ + ENV=ENV=~/.bashrc \ + TZ="America/New_York" \ + SHELL="/bin/sh" \ TERM="xterm-256color" \ - HOSTNAME="${HOSTNAME:-casjaysdev-$IMAGE_NAME}" \ - PORT="3000" \ + TIMEZONE="${TZ:-$TIMEZONE}" \ + HOSTNAME="casjaysdev-bun" \ + DEBIAN_FRONTEND="noninteractive" \ BUN_INSTALL="/usr/local/share/bun" +COPY ./rootfs/. / + RUN set -ex; \ - mkdir -p "/usr/local/share/template-files/data/htdocs/www" && \ - apt-get update && apt-get upgrade -yy && apt-get install -yy \ - unzip && \ - curl -q -fsSL https://bun.sh/install | bash && \ + rm -Rf "/etc/apt/sources.list" ; \ + mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" ; \ + echo 'export DEBIAN_FRONTEND="noninteractive"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh" && \ + echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION} main contrib non-free" >>"/etc/apt/sources.list" ; \ + echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-updates main contrib non-free" >>"/etc/apt/sources.list" ; \ + echo "deb http://deb.debian.org/debian-security/ ${DEBIAN_VERSION}-security main contrib non-free" >>"/etc/apt/sources.list" ; \ + apt-get update -yy && apt-get upgrade -yy && apt-get install -yy ${PACK_LIST} && \ + curl -q -fsSL "https://bun.sh/install" | bash && \ ln -sf /usr/local/share/bun/bin/bun /usr/local/bin && \ - git clone "https://github.com/casjay-templates/bunjs" "/usr/local/share/template-files/data/htdocs/www/" && \ - cd "/usr/local/share/template-files/data/htdocs/www" && \ + mkdir -p "${DEFAULT_DATA_DIR}/htdocs/www" && \ + git clone "https://github.com/casjay-templates/bunjs" "${DEFAULT_DATA_DIR}/htdocs/www/" && \ + rm -Rf ${DEFAULT_DATA_DIR}/htdocs/www/.git && \ + cd "${DEFAULT_DATA_DIR}/htdocs/www" && \ /usr/local/bin/bun install -COPY ./bin/. /usr/local/bin/ -COPY ./data/. /usr/local/share/template-files/data/ -COPY ./config/. /usr/local/share/template-files/config/ - -RUN rm -Rf /tmp/* /bin/.gitkeep /config /data /var/lib/apt/lists/* /usr/local/share/template-files/data/htdocs/www/.git +RUN echo 'Running cleanup' ; \ + update-alternatives --install /bin/sh sh /bin/bash 1 ; \ + apt-get clean ; \ + rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* ; \ + rm -Rf /usr/local/bin/.gitkeep /config /data /var/lib/apt/lists/* ; \ + rm -rf /lib/systemd/system/multi-user.target.wants/* ; \ + rm -rf /etc/systemd/system/*.wants/* ; \ + rm -rf /lib/systemd/system/local-fs.target.wants/* ; \ + rm -rf /lib/systemd/system/sockets.target.wants/*udev* ; \ + rm -rf /lib/systemd/system/sockets.target.wants/*initctl* ; \ + rm -rf /lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup* ; \ + rm -rf /lib/systemd/system/systemd-update-utmp* ; \ + if [ -d "/lib/systemd/system/sysinit.target.wants" ]; then cd "/lib/systemd/system/sysinit.target.wants" && rm $(ls | grep -v systemd-tmpfiles-setup) ; fi FROM scratch -ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')" +ARG SERVICE_PORT="3000" +ARG EXPOSE_PORTS="1-65535" +ARG PHP_SERVER="bun" +ARG NODE_VERSION="system" +ARG NODE_MANAGER="system" +ARG BUILD_VERSION="latest" +ARG LICENSE="MIT" +ARG IMAGE_NAME="bun" +ARG BUILD_DATE="Thu Oct 20 03:47:13 PM EDT 2022" +ARG TIMEZONE="America/New_York" -LABEL org.label-schema.name="bun" \ - org.label-schema.description="containerized version of bun" \ - org.label-schema.url="https://github.com/casjaysdevdocker/bun/bun" \ - org.label-schema.vcs-url="https://github.com/casjaysdevdocker/bun/bun" \ - org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.version=$BUILD_DATE \ - org.label-schema.vcs-ref=$BUILD_DATE \ - org.label-schema.license="WTFPL" \ - org.label-schema.vcs-type="Git" \ - org.label-schema.schema-version="latest" \ - org.label-schema.vendor="CasjaysDev" \ - maintainer="CasjaysDev " +LABEL maintainer="CasjaysDev " \ + org.opencontainers.image.vendor="CasjaysDev" \ + org.opencontainers.image.authors="CasjaysDev" \ + org.opencontainers.image.vcs-type="Git" \ + org.opencontainers.image.name="${IMAGE_NAME}" \ + org.opencontainers.image.base.name="${IMAGE_NAME}" \ + org.opencontainers.image.license="${LICENSE}" \ + org.opencontainers.image.vcs-ref="${BUILD_VERSION}" \ + org.opencontainers.image.build-date="${BUILD_DATE}" \ + org.opencontainers.image.version="${BUILD_VERSION}" \ + org.opencontainers.image.schema-version="${BUILD_VERSION}" \ + org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}" \ + org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \ + org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \ + org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}" \ + org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" -ENV SHELL="/bin/bash" \ - ENV="$HOME/.bashrc" \ +ENV LANG=en_US.utf8 \ + ENV=~/.bashrc \ + SHELL="/bin/bash" \ + PORT="${SERVICE_PORT}" \ TERM="xterm-256color" \ - HOSTNAME="casjaysdev-alpine" \ + PHP_SERVER="${PHP_SERVER}" \ + NODE_VERSION="${NODE_VERSION}" \ + NODE_MANAGER="${NODE_MANAGER}" \ + CONTAINER_NAME="${IMAGE_NAME}" \ TZ="${TZ:-America/New_York}" \ - TIMEZONE="$TIMEZONE" \ - PHP_SERVER="none" \ - PORT="" + TIMEZONE="${TZ:-$TIMEZONE}" \ + HOSTNAME="casjaysdev-${IMAGE_NAME}" \ + USER="root" COPY --from=build /. / +USER root WORKDIR /data/htdocs/www VOLUME [ "/config","/data" ] -EXPOSE $PORTS +EXPOSE $EXPOSE_PORTS -ENTRYPOINT [ "tini", "-p", "SIGTERM", "--" ] -CMD [ "/usr/local/bin/entrypoint-bun.sh" ] -HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint-bun.sh", "healthcheck" ] +#CMD [ "" ] +ENTRYPOINT [ "tini", "-p", "SIGTERM", "--", "/usr/local/bin/entrypoint.sh" ] +HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ] diff --git a/bin/entrypoint-bun.sh b/bin/entrypoint-bun.sh deleted file mode 100755 index afee171..0000000 --- a/bin/entrypoint-bun.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env bash -# shellcheck shell=bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202210121546-git -# @@Author : Jason Hempstead -# @@Contact : jason@casjaysdev.com -# @@License : WTFPL -# @@ReadME : entrypoint-bun.sh --help -# @@Copyright : Copyright: (c) 2022 Jason Hempstead, Casjays Developments -# @@Created : Wednesday, Oct 12, 2022 15:46 EDT -# @@File : entrypoint-bun.sh -# @@Description : -# @@Changelog : New script -# @@TODO : Better documentation -# @@Other : -# @@Resource : -# @@Terminal App : no -# @@sudo/root : no -# @@Template : other/docker-entrypoint -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Set bash options -[ -n "$DEBUG" ] && set -x -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -APPNAME="$(basename "$0" 2>/dev/null)" -VERSION="202210121546-git" -HOME="${USER_HOME:-$HOME}" -USER="${SUDO_USER:-$USER}" -RUN_USER="${SUDO_USER:-$USER}" -SCRIPT_SRC_DIR="${BASH_SOURCE%/*}" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Set functions -__find() { ls -A "$*" 2>/dev/null || return 10; } -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__exec_command() { - local cmd="${*:-/bin/bash -l}" - local exitCode=0 - echo "Executing command: $cmd" - eval "$cmd" || exitCode=10 - [ "$exitCode" = 0 ] || exitCode=10 - return ${exitCode:-$?} -} -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Functions -__heath_check() { - local status=0 - #curl -q -LSsf -o /dev/null -s -w "200" "http://localhost/server-health" || status=$(($status + 1)) - echo "$(uname -s) $(uname -m) is running" - return ${status:-$?} -} -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Define default variables - don not change these -export TZ="${TZ:-America/New_York}" -export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" -export HOSTNAME="${HOSTNAME:-casjaysdev-bin}" -export SSL="${SSL:-false}" -export SSL_DIR="${SSL_DIR:-/config/ssl}" -export SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}" -export SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}" -export SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Additional variables and variable overrides -export HTTP_PORT="${HTTP_PORT:-80}" -export HTTPS_PORT="${HTTPS_PORT:-443}" -export SERVICE_PORT="${SERVICE_PORT:-}" -export DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config/defaults}" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# import variables from file -[ -f "/root/env.sh" ] && . "/root/env.sh" -[ -f "/config/env.sh" ] && "/config/env.sh" -[ -f "/config/.env.sh" ] && . "/config/.env.sh" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Set timezone -[ -n "${TZ}" ] && echo "${TZ}" >"/etc/timezone" -[ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Set hostname -if [ -n "${HOSTNAME}" ]; then - echo "${HOSTNAME}" >"/etc/hostname" - echo "127.0.0.1 ${HOSTNAME} localhost ${HOSTNAME}.local" >"/etc/hosts" -fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Delete any gitkeep files -[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep -[ -d "/config" ] && rm -Rf "/config/.gitkeep" "/data"/*/*.gitkeep -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Setup bin directory -if [ -d "/config/bin" ]; then - for bin in /config/bin/*; do - name="$(basename "$bin")" - ln -sf "$bin" "/usr/local/bin/$name" - done -fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Create directories -[ -d "/etc/ssl" ] || mkdir -p "/etc/ssl" -[ -d "/usr/local/bin" ] && rm -Rf "/usr/local/bin/.gitkeep" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -if [ "$SSL" = "true" ] || [ "$SSL" = "yes" ]; then - if [ -f "/config/ssl/server.crt" ] && [ -f "/config/ssl/server.key" ]; then - export SSL="true" - if [ -n "$SSL_CA" ] && [ -f "$SSL_CA" ]; then - mkdir -p "/etc/ssl/certs" - cat "$SSL_CA" >>"/etc/ssl/certs/ca-certificates.crt" - fi - else - [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR" - create-ssl-cert - fi - type update-ca-certificates &>/dev/null && update-ca-certificates -fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ -f "$SSL_CA" ] && cp -Rfv "$SSL_CA" "/etc/ssl/ca.crt" -[ -f "$SSL_KEY" ] && cp -Rfv "$SSL_KEY" "/etc/ssl/server.key" -[ -f "$SSL_CERT" ] && cp -Rfv "$SSL_CERT" "/etc/ssl/server.crt" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Create default config -if [ ! -e "/config/$APPNAME" ] && [ -e "$DEFAULT_CONF_DIR/$APPNAME" ]; then - cp -Rf "$DEFAULT_CONF_DIR/$APPNAME" "/config/$APPNAME" -fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Setup bun -mkdir -p "/data/htdocs/www" && cd "/data/htdocs/www" || exit 10 -if [ -z "$1" ] && [ -z "$(ls -A "/data/htdocs/www"/* 2>/dev/null)" ]; then - cp -Rf "/usr/local/share/template-files/data/htdocs/www/." "/data/htdocs/www/" -fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Additional commands - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -case "$1" in ---help) # Help message - echo 'Docker container for '$APPNAME'' - echo "Usage: $APPNAME [healthcheck, bash, command]" - echo "Failed command will have exit code 10" - echo "" - exit ${exitCode:-$?} - ;; - -healthcheck) # Docker healthcheck - __heath_check || exitCode=10 - exit ${exitCode:-$?} - ;; - -*/bin/sh | */bin/bash | bash | shell | sh) # Launch shell - shift 1 - __exec_command "${@:-/bin/bash}" - exit ${exitCode:-$?} - ;; - -bun) - shift 1 - bun "$@" - ;; - -*) # Execute primary command - if [ $# -eq 0 ]; then - if [ -n "$START_SCRIPT" ]; then - RUN_SCRIPT="$START_SCRIPT" - elif [ -f "src/index.ts" ]; then - RUN_SCRIPT="index.ts" - elif [ -f "index.ts" ]; then - RUN_SCRIPT="index.ts" - elif [ -f "app.ts" ]; then - RUN_SCRIPT="app.ts" - elif [ -f "server.ts" ]; then - RUN_SCRIPT="server.ts" - fi - echo "Running bun install" - bun install - echo "Running bun dev ${RUN_SCRIPT:-$START_SCRIPT}" - bun dev ${RUN_SCRIPT:-$START_SCRIPT} || { echo "Failed to run bun dev ${RUN_SCRIPT:-$START_SCRIPT}" && return 1; } - exit ${exitCode:-$?} - else - __exec_command "$@" - exitCode=$? - fi - ;; -esac -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# end of entrypoint -exit ${exitCode:-$?} -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh new file mode 100755 index 0000000..f14a0de --- /dev/null +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -0,0 +1,283 @@ +#!/usr/bin/env bash +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202210201538-git +# @@Author : Jason Hempstead +# @@Contact : jason@casjaysdev.com +# @@License : LICENSE.md +# @@ReadME : entrypoint.sh --help +# @@Copyright : Copyright: (c) 2022 Jason Hempstead, Casjays Developments +# @@Created : Thursday, Oct 20, 2022 15:38 EDT +# @@File : entrypoint.sh +# @@Description : entrypoint point for bun +# @@Changelog : New script +# @@TODO : Better documentation +# @@Other : +# @@Resource : +# @@Terminal App : no +# @@sudo/root : no +# @@Template : other/docker-entrypoint +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set bash options +[ -n "$DEBUG" ] && set -x +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set functions +__exec_command() { + local exitCode=0 + local cmd="${*:-bash -l}" + echo "${exec_message:-Executing command: $cmd}" + $cmd || exitCode=1 + [ "$exitCode" = 0 ] || exitCode=10 + return ${exitCode:-$?} +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" || return 1; } +__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; } +__curl() { curl -q -LSsf -o /dev/null -s -w "200" "$@" 2>/dev/null || return 10; } +__pgrep() { __pcheck "${1:-$SERVICE_NAME}" || ps aux 2>/dev/null | grep -Fw " ${1:-$SERVICE_NAME}" | grep -qv ' grep' || return 10; } +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__certbot() { + [ -n "$DOMANNAME" ] && [ -n "$CERT_BOT_MAIL" ] || { echo "The variables DOMANNAME and CERT_BOT_MAIL are set" && exit 1; } + [ "$SSL_CERT_BOT" = "true" ] && type -P certbot &>/dev/null || { export SSL_CERT_BOT="" && return 10; } + certbot $1 --agree-tos -m $CERT_BOT_MAIL certonly --webroot -w "${WWW_ROOT_DIR:-/data/htdocs/www}" -d $DOMAINNAME -d $DOMAINNAME \ + --put-all-related-files-into "$SSL_DIR" -key-path "$SSL_KEY" -fullchain-path "$SSL_CERT" +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__heath_check() { + status=0 health="Good" + __pgrep ${1:-} || status=$((status + 1)) + #__curl "https://1.1.1.1" || status=$((status + 1)) + #__curl "http://localhost:$HTTP_PORT/server-health" || status=$((status + 1)) + [ "$status" -eq 0 ] || health="Errors reported see docker logs --follow $CONTAINER_NAME" + echo "$(uname -s) $(uname -m) is running and the health is: $health" + return ${status:-$?} +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__start_all_services() { + echo "$service_message" + start-bin + return $? +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional functions + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# export functions +export -f __exec_command __pcheck __pgrep __find __curl __heath_check __certbot __start_all_services +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Define default variables - do not change these - redefine with -e or set under Additional +DISPLAY="${DISPLAY:-}" +LANG="${LANG:-C.UTF-8}" +DOMAINNAME="${DOMAINNAME:-}" +TZ="${TZ:-America/New_York}" +HTTP_PORT="${HTTP_PORT:-80}" +HTTPS_PORT="${HTTPS_PORT:-}" +SERVICE_PORT="${SERVICE_PORT:-}" +SERVICE_NAME="${CONTAINER_NAME:-}" +HOSTNAME="${HOSTNAME:-casjaysdev-bun}" +HOSTADMIN="${HOSTADMIN:-root@${DOMAINNAME:-$HOSTNAME}}" +CERT_BOT_MAIL="${CERT_BOT_MAIL:-certbot-mail@casjay.net}" +SSL_CERT_BOT="${SSL_CERT_BOT:-false}" +SSL_ENABLED="${SSL_ENABLED:-false}" +SSL_DIR="${SSL_DIR:-/config/ssl}" +SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}" +SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}" +SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}" +SSL_CONTAINER_DIR="${SSL_CONTAINER_DIR:-/etc/ssl/CA}" +WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}" +LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" +DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}" +DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}" +DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}" +CONTAINER_IP_ADDRESS="$(ip a 2>/dev/null | grep 'inet' | grep -v '127.0.0.1' | awk '{print $2}' | sed 's|/.*||g')" +[ -n "$HTTP_PORT" ] || [ -n "$HTTPS_PORT" ] || HTTP_PORT="$SERVICE_PORT" +[ "$HTTPS_PORT" = "443" ] && HTTP_PORT="$HTTPS_PORT" && SSL_ENABLED="true" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional variables and variable overrides +#SERVICE_NAME="" +export service_message="Starting $CONTAINER_NAME" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Check if this is a new container +[ -f "/data/.docker_has_run" ] && DATA_DIR_INITIALIZED="true" || DATA_DIR_INITIALIZED="false" +[ -f "/config/.docker_has_run" ] && CONFIG_DIR_INITIALIZED="true" || CONFIG_DIR_INITIALIZED="false" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# export variables +export LANG TZ DOMAINNAME HOSTNAME HOSTADMIN SSL_ENABLED SSL_DIR SSL_CA SSL_KEY SERVICE_NAME +export SSL_DIR HTTP_PORT HTTPS_PORT LOCAL_BIN_DIR DEFAULT_CONF_DIR CONTAINER_IP_ADDRESS +export SSL_CONTAINER_DIR SSL_CERT_BOT DISPLAY CONFIG_DIR_INITIALIZED DATA_DIR_INITIALIZED +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# import variables from file +[ -f "/root/env.sh" ] && . "/root/env.sh" +[ -f "/config/env.sh" ] && "/config/env.sh" +[ -f "/config/.env.sh" ] && . "/config/.env.sh" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set timezone +[ -n "$TZ" ] && echo "$TZ" >"/etc/timezone" +[ -f "/usr/share/zoneinfo/$TZ" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set hostname +if [ -n "$HOSTNAME" ]; then + echo "$HOSTNAME" >"/etc/hostname" + echo "127.0.0.1 $HOSTNAME localhost $HOSTNAME.local" >"/etc/hosts" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Add domain to hosts file +if [ -n "$DOMAINNAME" ]; then + echo "$HOSTNAME.${DOMAINNAME:-local}" >"/etc/hostname" + echo "127.0.0.1 $HOSTNAME localhost $HOSTNAME.local" >"/etc/hosts" + echo "${CONTAINER_IP_ADDRESS:-127.0.0.1} $HOSTNAME.$DOMAINNAME" >>"/etc/hosts" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Delete any gitkeep files +[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep +[ -d "/config" ] && rm -Rf "/config/.gitkeep" "/data"/*/*.gitkeep +[ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create directories +[ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create files + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create symlinks + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +if [ "$SSL_ENABLED" = "true" ] || [ "$SSL_ENABLED" = "yes" ]; then + if [ -f "/config/ssl/server.crt" ] && [ -f "/config/ssl/server.key" ]; then + export SSL_ENABLED="true" + if [ -n "$SSL_CA" ] && [ -f "$SSL_CA" ]; then + mkdir -p "$SSL_CONTAINER_DIR/certs" + cat "$SSL_CA" >>"/etc/ssl/certs/ca-certificates.crt" + cp -Rf "/config/ssl/." "$SSL_CONTAINER_DIR/" + fi + else + [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR" + create-ssl-cert + fi + type update-ca-certificates &>/dev/null && update-ca-certificates +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +[ -f "$SSL_CA" ] && cp -Rfv "$SSL_CA" "$SSL_CONTAINER_DIR/ca.crt" +[ -f "$SSL_KEY" ] && cp -Rfv "$SSL_KEY" "$SSL_CONTAINER_DIR/server.key" +[ -f "$SSL_CERT" ] && cp -Rfv "$SSL_CERT" "$SSL_CONTAINER_DIR/server.crt" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Setup bin directory +SET_USR_BIN="" +[ -d "/data/bin" ] && SET_USR_BIN+="$(__find /data/bin f) " +[ -d "/config/bin" ] && SET_USR_BIN+="$(__find /config/bin f) " +if [ -n "$SET_USR_BIN" ]; then + echo "Setting up bin" + for create_bin in $SET_USR_BIN; do + create_bin_name="$(basename "$create_bin")" + ln -sf "$create_bin" "$LOCAL_BIN_DIR/$create_bin_name" + done +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create default config +if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then + echo "Copying default config files" + if [ -n "$DEFAULT_TEMPLATE_DIR" ] && [ -d "$DEFAULT_TEMPLATE_DIR" ]; then + for create_template in "$DEFAULT_TEMPLATE_DIR"/*; do + create_template_name="$(basename "$create_template")" + cp -Rf "$create_template" "/config/$create_template_name" 2>/dev/null + done + fi +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy custom config files +if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then + echo "Copying custom config files" + for create_config in "$DEFAULT_CONF_DIR"/*; do + create_config_name="$(basename "$create_config")" + cp -Rf "$create_config" "/config/$create_config_name" 2>/dev/null + done +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy custom data files +if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -d "/data" ]; then + echo "Copying data files" + for create_data in "$DEFAULT_DATA_DIR"/*; do + create_data_name="$(basename "$create_data")" + cp -Rf "$create_data" "/data/$create_data_name" 2>/dev/null + done +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy /config to /etc +if [ -d "/config" ]; then + echo "Copying /config to /etc" + for create_conf in /config/*; do + if [ -n "$create_conf" ]; then + create_conf_name="$(basename "$create_conf")" + if [ -e "/etc/$create_conf_name" ]; then + if [ -d "/etc/$create_conf_name" ]; then + cp -Rf "$create_conf/." "/etc/$create_conf_name/" 2>/dev/null + else + cp -Rf "$create_conf" "/etc/$create_conf_name" 2>/dev/null + fi + fi + fi + done +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Unset unneeded variables +unset SET_USR_BIN create_bin create_bin_name create_template create_template_name +unset create_data create_data_name create_config create_config_name create_conf create_conf_name +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +[ -f "/data/.docker_has_run" ] || { [ -d "/data" ] && echo "Initialized on: $(date)" >"/data/.docker_has_run"; } +[ -f "/config/.docker_has_run" ] || { [ -d "/config" ] && echo "Initialized on: $(date)" >"/config/.docker_has_run"; } +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional commands + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Show message +echo "Container ip address is: $CONTAINER_IP_ADDRESS" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +case "$1" in +--help) # Help message + echo 'Docker container for '$APPNAME'' + echo "Usage: $APPNAME [healthcheck, bash, command]" + echo "Failed command will have exit code 10" + echo "" + exit ${exitCode:-$?} + ;; + +healthcheck) # Docker healthcheck + __heath_check "${1:-$SERVICE_NAME}" || exitCode=10 + exit ${exitCode:-$?} + ;; + +*/bin/sh | */bin/bash | bash | shell | sh) # Launch shell + shift 1 + __exec_command "${@:-/bin/bash}" + exit ${exitCode:-$?} + ;; + +certbot) + shift 1 + SSL_CERT_BOT="true" + if [ "$1" = "create" ]; then + shift 1 + __certbot + elif [ "$1" = "renew" ]; then + shift 1 + __certbot "renew certonly --force-renew" + else + __exec_command "certbot" "$@" + fi + ;; + +*) # Execute primary command + if [ $# -eq 0 ]; then + __start_all_services + exit ${exitCode:-$?} + else + __exec_command "$@" + exitCode=$? + fi + ;; +esac +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# end of entrypoint +exit ${exitCode:-$?} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rootfs/usr/local/bin/start-bun.sh b/rootfs/usr/local/bin/start-bun.sh new file mode 100755 index 0000000..60eb892 --- /dev/null +++ b/rootfs/usr/local/bin/start-bun.sh @@ -0,0 +1,178 @@ +#!/usr/bin/env bash +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202210201538-git +# @@Author : Jason Hempstead +# @@Contact : jason@casjaysdev.com +# @@License : LICENSE.md +# @@ReadME : start-bun.sh --help +# @@Copyright : Copyright: (c) 2022 Jason Hempstead, Casjays Developments +# @@Created : Thursday, Oct 20, 2022 15:38 EDT +# @@File : start-bun.sh +# @@Description : script to start bun +# @@Changelog : New script +# @@TODO : Better documentation +# @@Other : +# @@Resource : +# @@Terminal App : no +# @@sudo/root : no +# @@Template : other/start-service +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set functions +__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" || return 1; } +__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; } +__curl() { curl -q -LSsf -o /dev/null -s -w "200" "$@" 2>/dev/null || return 10; } +__pgrep() { __pcheck "$1" || ps aux 2>/dev/null | grep -Fw " $1" | grep -qv ' grep' || return 10; } +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__certbot() { + [ -n "$DOMANNAME" ] && [ -n "$CERT_BOT_MAIL" ] || { echo "The variables DOMANNAME and CERT_BOT_MAIL are set" && exit 1; } + [ "$SSL_CERT_BOT" = "true" ] && type -P certbot &>/dev/null || { export SSL_CERT_BOT="" && return 10; } + certbot $1 --agree-tos -m $CERT_BOT_MAIL certonly --webroot -w "${WWW_ROOT_DIR:-/data/htdocs/www}" -d $DOMAINNAME -d $DOMAINNAME \ + --put-all-related-files-into "$SSL_DIR" -key-path "$SSL_KEY" -fullchain-path "$SSL_CERT" +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__heath_check() { + status=0 health="Good" + __pgrep ${1:-} || status=$((status + 1)) + #__curl "http://localhost:$HTTP_PORT/server-health" || status=$((status + 1)) + [ "$status" -eq 0 ] || health="Errors reported see docker logs --follow $CONTAINER_NAME" + echo "$(uname -s) $(uname -m) is running and the health is: $health" + return ${status:-$?} +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +__init_bin() { + if [ -n "$START_SCRIPT" ]; then + RUN_SCRIPT="$START_SCRIPT" + elif [ -f "src/index.ts" ]; then + RUN_SCRIPT="index.ts" + elif [ -f "index.ts" ]; then + RUN_SCRIPT="index.ts" + elif [ -f "app.ts" ]; then + RUN_SCRIPT="app.ts" + elif [ -f "server.ts" ]; then + RUN_SCRIPT="server.ts" + fi + echo "Running bun install" + __exec_command $SERVICE_COMMAND install + echo "Running bun dev ${RUN_SCRIPT:-$START_SCRIPT}" + __exec_command $SERVICE_COMMAND dev ${RUN_SCRIPT:-$START_SCRIPT} || { echo "Failed to run bun dev ${RUN_SCRIPT:-$START_SCRIPT}" && return 1; } +} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set variables +DISPLAY="${DISPLAY:-}" +LANG="${LANG:-C.UTF-8}" +DOMAINNAME="${DOMAINNAME:-}" +TZ="${TZ:-America/New_York}" +HTTP_PORT="${HTTP_PORT:-80}" +HTTPS_PORT="${HTTPS_PORT:-}" +SERVICE_PORT="${SERVICE_PORT:-$HTTP_PORT}" +SERVICE_NAME="${CONTAINER_NAME:-}" +HOSTNAME="${HOSTNAME:-casjaysdev-bun}" +HOSTADMIN="${HOSTADMIN:-root@${DOMAINNAME:-$HOSTNAME}}" +SSL_CERT_BOT="${SSL_CERT_BOT:-false}" +SSL_ENABLED="${SSL_ENABLED:-false}" +SSL_DIR="${SSL_DIR:-/config/ssl}" +SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}" +SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}" +SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}" +SSL_CONTAINER_DIR="${SSL_CONTAINER_DIR:-/etc/ssl/CA}" +WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}" +LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" +DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-}" +CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-}" +DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}" +DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}" +DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}" +CONTAINER_IP_ADDRESS="$(ip a 2>/dev/null | grep 'inet' | grep -v '127.0.0.1' | awk '{print $2}' | sed 's|/.*||g')" +[ -n "$HTTP_PORT" ] || [ -n "$HTTPS_PORT" ] || HTTP_PORT="$SERVICE_PORT" +[ "$HTTPS_PORT" = "443" ] && HTTP_PORT="$HTTPS_PORT" && SSL_ENABLED="true" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Overwrite variables +#SERVICE_PORT="" +SERVICE_NAME="bun" +SERVICE_COMMAND="$SERVICE_NAME" +export exec_message="Starting $SERVICE_NAME on $CONTAINER_IP_ADDRESS:$SERVICE_PORT" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Pre copy commands + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Check if this is a new container +[ -z "$DATA_DIR_INITIALIZED" ] && [ -f "/data/.docker_has_run" ] && DATA_DIR_INITIALIZED="true" +[ -z "$CONFIG_DIR_INITIALIZED" ] && [ -f "/config/.docker_has_run" ] && CONFIG_DIR_INITIALIZED="true" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create default config +if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_TEMPLATE_DIR" ]; then + [ -d "/config" ] && cp -Rf "$DEFAULT_TEMPLATE_DIR/." "/config/" 2>/dev/null +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy custom config files +if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_CONF_DIR" ]; then + [ -d "/config" ] && cp -Rf "$DEFAULT_CONF_DIR/." "/config/" 2>/dev/null +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy custom data files +if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_DATA_DIR" ]; then + [ -d "/data" ] && cp -Rf "$DEFAULT_DATA_DIR/." "/data/" 2>/dev/null +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy html files +if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -d "$DEFAULT_DATA_DIR/data/htdocs" ]; then + [ -d "/data" ] && cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Post copy commands + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Initialized +[ -d "/data" ] && touch "/data/.docker_has_run" +[ -d "/config" ] && touch "/config/.docker_has_run" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# APP Variables overrides +[ -f "/root/env.sh" ] && . "/root/env.sh" +[ -f "/config/env.sh" ] && "/config/env.sh" +[ -f "/config/.env.sh" ] && . "/config/.env.sh" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Actions based on env + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# begin main app +case "$1" in +healthcheck) + shift 1 + __heath_check "${SERVICE_NAME:-bash}" + exit $? + ;; + +certbot) + shift 1 + SSL_CERT_BOT="true" + if [ "$1" = "create" ]; then + shift 1 + __certbot + elif [ "$1" = "renew" ]; then + shift 1 + __certbot "renew certonly --force-renew" + else + __exec_command "certbot" "$@" + fi + ;; + +*) + if __pgrep "$SERVICE_NAME" && [ ! -f "/tmp/$SERVICE_NAME.pid" ]; then + echo "$SERVICE_NAME is running" + else + touch "/tmp/$SERVICE_NAME.pid" + __init_bin || rm -Rf "/tmp/$SERVICE_NAME.pid" + fi + ;; +esac +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Set exit code +exitCode="${exitCode:-$?}" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# End application +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# lets exit with code +exit ${exitCode:-$?} +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# end diff --git a/bin/.gitkeep b/rootfs/usr/local/share/template-files/config/.gitkeep similarity index 100% rename from bin/.gitkeep rename to rootfs/usr/local/share/template-files/config/.gitkeep diff --git a/config/.gitkeep b/rootfs/usr/local/share/template-files/data/.gitkeep similarity index 100% rename from config/.gitkeep rename to rootfs/usr/local/share/template-files/data/.gitkeep diff --git a/data/.gitkeep b/rootfs/usr/local/share/template-files/defaults/.gitkeep similarity index 100% rename from data/.gitkeep rename to rootfs/usr/local/share/template-files/defaults/.gitkeep