diff --git a/Dockerfile b/Dockerfile index f4bbf41..a0d1010 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM casjaysdevdocker/alpine:latest as build ARG LICENSE=WTFPL \ - IMAGE_NAME=traefix \ + IMAGE_NAME=traefik \ TIMEZONE=America/New_York \ PORT= @@ -13,7 +13,7 @@ ENV SHELL=/bin/bash \ RUN mkdir -p /bin/ /config/ /data/ && \ rm -Rf /bin/.gitkeep /config/.gitkeep /data/.gitkeep && \ apk update -U --no-cache && \ - apk add --no-cache traefix + apk add --no-cache traefik COPY ./bin/. /usr/local/bin/ COPY ./config/. /config/ @@ -22,10 +22,10 @@ COPY ./data/. /data/ FROM scratch ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')" -LABEL org.label-schema.name="traefix" \ - org.label-schema.description="Containerized version of traefix" \ - org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/traefix" \ - org.label-schema.vcs-url="https://github.com/casjaysdevdocker/traefix" \ +LABEL org.label-schema.name="traefik" \ + org.label-schema.description="Containerized version of traefik" \ + org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/traefik" \ + org.label-schema.vcs-url="https://github.com/casjaysdevdocker/traefik" \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.version=$BUILD_DATE \ org.label-schema.vcs-ref=$BUILD_DATE \ @@ -37,7 +37,7 @@ LABEL org.label-schema.name="traefix" \ ENV SHELL="/bin/bash" \ TERM="xterm-256color" \ - HOSTNAME="casjaysdev-traefix" \ + HOSTNAME="casjaysdev-traefik" \ TZ="${TZ:-America/New_York}" WORKDIR /root @@ -49,6 +49,6 @@ EXPOSE $PORT COPY --from=build /. / ENTRYPOINT [ "tini", "--" ] -HEALTHCHECK CMD [ "/usr/local/bin/entrypoint-traefix.sh", "healthcheck" ] -CMD [ "/usr/local/bin/entrypoint-traefix.sh" ] +HEALTHCHECK CMD [ "/usr/local/bin/entrypoint-traefik.sh", "healthcheck" ] +CMD [ "/usr/local/bin/entrypoint-traefik.sh" ] diff --git a/bin/entrypoint-traefix.sh b/bin/entrypoint-traefix.sh index e218c86..7d26dac 100755 --- a/bin/entrypoint-traefix.sh +++ b/bin/entrypoint-traefix.sh @@ -5,10 +5,10 @@ # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.com # @@License : LICENSE.md -# @@ReadME : entrypoint-traefix.sh --help +# @@ReadME : entrypoint-traefik.sh --help # @@Copyright : Copyright: (c) 2022 Jason Hempstead, Casjays Developments # @@Created : Thursday, Sep 08, 2022 10:06 EDT -# @@File : entrypoint-traefix.sh +# @@File : entrypoint-traefik.sh # @@Description : # @@Changelog : New script # @@TODO : Better documentation @@ -94,8 +94,8 @@ fi [ -f "/etc/.env.sh" ] && rm -Rf "/etc/.env.sh" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Additional commands -[ -d "/config/traefix" ] || mkdir -p "/config/traefix" -[ -f "/config/traefix/.yml" ] || cp -Rf "/etc/traefik/traefik.yml" "/config/traefix" +[ -d "/config/traefik" ] || mkdir -p "/config/traefik" +[ -f "/config/traefik/.yml" ] || cp -Rf "/etc/traefik/traefik.yml" "/config/traefik" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case "$1" in --help) # Help message @@ -120,7 +120,7 @@ healthcheck) # Docker healthcheck *) # Execute primary command if [ $# -eq 0 ]; then - traefix + traefik else __exec_bash "/bin/bash" fi