minimal changes for apply docker buildx prerequesities
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
ARG BUILDPLATFORM
|
||||
FROM --platform=$BUILDPLATFORM alpine:latest AS redis-source
|
||||
FROM alpine:latest AS redis-source
|
||||
|
||||
ARG REDIS_VERSION="7.2.4"
|
||||
ARG REDIS_DOWNLOAD_URL="http://download.redis.io/releases/redis-${REDIS_VERSION}.tar.gz"
|
||||
@@ -10,8 +9,7 @@ RUN wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" && \
|
||||
cd /usr/src/redis/src && \
|
||||
make BUILD_TLS=yes MALLOC=libc redis-cli
|
||||
|
||||
ARG BUILDPLATFORM
|
||||
FROM --platform=$BUILDPLATFORM alpine:latest
|
||||
FROM alpine:latest
|
||||
|
||||
COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli
|
||||
RUN chmod +x /usr/bin/redis-cli
|
||||
|
@@ -7,10 +7,11 @@ USER_INIT_PATH=$USER_INIT_PATH
|
||||
WEB_SERVER=${WEB_SERVER:-webserver}
|
||||
WEB_IMAGE=${WEB_IMAGE:-web-installer}
|
||||
WEBSERVER_PORT=${WEBSERVER_PORT:-8080}
|
||||
WEBSERVER_VERSION=${WEBSERVER_VERSION:-1.0.0}
|
||||
WEBSERVER_VERSION=${WEBSERVER_VERSION:-latest}
|
||||
REDIS_SERVER=${REDIS_SERVER:-redis}
|
||||
REDIS_PORT=${REDIS_PORT:-6379}
|
||||
REDIS_IMAGE=${REDIS_IMAGE:-redis}
|
||||
REDIS_VERSION=${REDIS_VERSION:-latest}
|
||||
|
||||
SOURCE=$SOURCE
|
||||
SMARTHOST_PROXY_PATH=$SMARTHOST_PROXY_PATH
|
||||
@@ -22,6 +23,7 @@ REPO=$REPO
|
||||
# scheduler settings
|
||||
CURL_SLEEP_SHORT=${CURL_SLEEP_SHORT:-5}
|
||||
CURL_RETRIES=${CURL_RETRIES:-360}
|
||||
|
||||
SCHEDULER_SERVICEFILE_GENERATE_TEST=${SCHEDULER_SERVICEFILE_GENERATE_TEST:-false}
|
||||
|
||||
check_redis_availability() {
|
||||
@@ -52,7 +54,7 @@ check_redis_availability() {
|
||||
|
||||
start_redis () {
|
||||
|
||||
/usr/bin/docker run -d --name $REDIS_SERVER $REDIS_IMAGE:latest
|
||||
/usr/bin/docker run -d --name $REDIS_SERVER $REDIS_IMAGE:$REDIS_VERSION
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user