safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

minimal changes for apply docker buildx prerequesities

Browse Source
This commit is contained in:
gyurix
2024-07-22 14:10:55 +02:00
parent 113060ba17
commit f20adf7217
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -1,5 +1,4 @@
ARG BUILDPLATFORM FROM alpine:latest AS redis-source
FROM --platform=$BUILDPLATFORM alpine:latest AS redis-source
ARG REDIS_VERSION="7.2.4" ARG REDIS_VERSION="7.2.4"
ARG REDIS_DOWNLOAD_URL="http://download.redis.io/releases/redis-${REDIS_VERSION}.tar.gz" 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 && \ cd /usr/src/redis/src && \
make BUILD_TLS=yes MALLOC=libc redis-cli make BUILD_TLS=yes MALLOC=libc redis-cli
ARG BUILDPLATFORM FROM alpine:latest
FROM --platform=$BUILDPLATFORM alpine:latest
COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli
RUN chmod +x /usr/bin/redis-cli RUN chmod +x /usr/bin/redis-cli

6
scripts/scheduler/entrypoint.sh
View File

@@ -7,10 +7,11 @@ USER_INIT_PATH=$USER_INIT_PATH
WEB_SERVER=${WEB_SERVER:-webserver} WEB_SERVER=${WEB_SERVER:-webserver}
WEB_IMAGE=${WEB_IMAGE:-web-installer} WEB_IMAGE=${WEB_IMAGE:-web-installer}
WEBSERVER_PORT=${WEBSERVER_PORT:-8080} WEBSERVER_PORT=${WEBSERVER_PORT:-8080}
WEBSERVER_VERSION=${WEBSERVER_VERSION:-1.0.0} WEBSERVER_VERSION=${WEBSERVER_VERSION:-latest}
REDIS_SERVER=${REDIS_SERVER:-redis} REDIS_SERVER=${REDIS_SERVER:-redis}
REDIS_PORT=${REDIS_PORT:-6379} REDIS_PORT=${REDIS_PORT:-6379}
REDIS_IMAGE=${REDIS_IMAGE:-redis} REDIS_IMAGE=${REDIS_IMAGE:-redis}
REDIS_VERSION=${REDIS_VERSION:-latest}
SOURCE=$SOURCE SOURCE=$SOURCE
SMARTHOST_PROXY_PATH=$SMARTHOST_PROXY_PATH SMARTHOST_PROXY_PATH=$SMARTHOST_PROXY_PATH
@@ -22,6 +23,7 @@ REPO=$REPO
# scheduler settings # scheduler settings
CURL_SLEEP_SHORT=${CURL_SLEEP_SHORT:-5} CURL_SLEEP_SHORT=${CURL_SLEEP_SHORT:-5}
CURL_RETRIES=${CURL_RETRIES:-360} CURL_RETRIES=${CURL_RETRIES:-360}
SCHEDULER_SERVICEFILE_GENERATE_TEST=${SCHEDULER_SERVICEFILE_GENERATE_TEST:-false} SCHEDULER_SERVICEFILE_GENERATE_TEST=${SCHEDULER_SERVICEFILE_GENERATE_TEST:-false}
check_redis_availability() { check_redis_availability() {
@@ -52,7 +54,7 @@ check_redis_availability() {
start_redis () { 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
} }