diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index dc2c1c2ab1..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM alpine:3.13 - -COPY . / -RUN apk add --no-cache tini libc6-compat && chmod +x /entrypoint.server.sh && chmod +x /opt/easegress/bin/* - -ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.server.sh"] diff --git a/build/package/Dockerfile b/build/package/Dockerfile index 98d90fe7c1..eccdafa4cd 100644 --- a/build/package/Dockerfile +++ b/build/package/Dockerfile @@ -8,14 +8,14 @@ RUN make clean && make build # --- -FROM alpine:3.13 +FROM alpine:latest WORKDIR /opt/easegress COPY build/package/entrypoint.sh / COPY --from=builder /opt/easegress/bin/ /opt/easegress/bin/ -RUN apk --no-cache add tini && \ +RUN apk --no-cache add tini tzdata && \ chmod +x /entrypoint.sh /opt/easegress/bin/* ENV PATH /opt/easegress/bin:$PATH diff --git a/build/package/Dockerfile.goreleaser b/build/package/Dockerfile.goreleaser index 7a96783f79..2b769927dc 100644 --- a/build/package/Dockerfile.goreleaser +++ b/build/package/Dockerfile.goreleaser @@ -1,11 +1,11 @@ -FROM alpine:3.13 +FROM alpine:latest WORKDIR /opt/easegress ADD egctl easegress-server /opt/easegress/bin/ COPY build/package/entrypoint.sh / -RUN apk --no-cache add tini && \ +RUN apk --no-cache add tini tzdata && \ chmod +x /entrypoint.sh /opt/easegress/bin/* ENV PATH /opt/easegress/bin:$PATH diff --git a/release/build-client-image.sh b/release/build-client-image.sh deleted file mode 100755 index 157094ecaa..0000000000 --- a/release/build-client-image.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -e - -pushd $(dirname $0) > /dev/null -SCRIPTPATH=$(pwd -P) -popd > /dev/null -SCRIPTFILE=$(basename $0) - -function log() { - echo "================================================================================" - echo "$(date +'%Y-%m-%d %H:%M:%S%z') [INFO] - $@" - echo "" -} - -function err() { - echo "================================================================================" - echo "$(date +'%Y-%m-%d %H:%M:%S%z') [ERRO] - $@" >&2 -} - -# ================================================================================ - -log "Build easegress client image.." - -cd ${SCRIPTPATH}/.. -make build_client_alpine diff --git a/release/build-server-image.sh b/release/build-server-image.sh deleted file mode 100755 index 1e628e667f..0000000000 --- a/release/build-server-image.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -set -e - -pushd $(dirname $0) > /dev/null -SCRIPTPATH=$(pwd -P) -popd > /dev/null -SCRIPTFILE=$(basename $0) - -function log() { - echo "================================================================================" - echo "$(date +'%Y-%m-%d %H:%M:%S%z') [INFO] - $@" - echo "" -} - -function err() { - echo "================================================================================" - echo "$(date +'%Y-%m-%d %H:%M:%S%z') [ERRO] - $@" >&2 -} - -# ================================================================================ - -log "Build easegress server image.." - -cd ${SCRIPTPATH}/.. -make build_server_alpine -# make build_server_ubuntu