Skip to content

Commit d57eb60

Browse files
committed
Fix Dockerfile.api update
1 parent 76c8e84 commit d57eb60

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LABEL Version 3.3-dev8
2424
LABEL RUN /usr/bin/docker -d IMAGE
2525

2626
ENV HAPROXY_BRANCH 3.3
27-
ENV HAPROXY_MINOR 3.3-dev8
27+
ENV HAPROXY_MINOR 3.3-temp
2828
ENV HAPROXY_SHA256 bbe414ef09d8b7091b139d1c0157840739aa24ad93851ea1fb815c135c198431
2929
ENV HAPROXY_SRC_URL http://www.haproxy.org/download
3030

update.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ sed -r -i -e "s!^(ENV HAPROXY_SRC_URL) .*!\1 ${HAPROXY_SRC_URL}!;
7474
s!^(ENV DATAPLANE_V2_MINOR) .*!\1 ${DATAPLANE_V2_MINOR}!" \
7575
"${DOCKERFILE}"
7676

77-
sed -r -i -e "s!^(ENV HAPROXY_SRC_URL) .*!\1 ${HAPROXY_SRC_URL}!;
78-
s!^(ENV HAPROXY_BRANCH) .*!\1 ${HAPROXY_BRANCH}!;
79-
s!^(ENV HAPROXY_MINOR) .*!\1 ${HAPROXY_MINOR}!;
80-
s!^(LABEL Version) .*!\1 ${HAPROXY_MINOR}!;
81-
s!^(ENV HAPROXY_SHA256) .*!\1 ${HAPROXY_SHA256}!
82-
s!^(ENV DATAPLANE_MINOR) .*!\1 ${DATAPLANE_MINOR}!
83-
s!^(ENV DATAPLANE_V2_MINOR) .*!\1 ${DATAPLANE_V2_MINOR}!" \
84-
"${DOCKERFILE_API}"
77+
if [ -f "${DOCKERFILE_API}" ]; then
78+
sed -r -i -e "s!^(ENV HAPROXY_SRC_URL) .*!\1 ${HAPROXY_SRC_URL}!;
79+
s!^(ENV HAPROXY_BRANCH) .*!\1 ${HAPROXY_BRANCH}!;
80+
s!^(ENV HAPROXY_MINOR) .*!\1 ${HAPROXY_MINOR}!;
81+
s!^(LABEL Version) .*!\1 ${HAPROXY_MINOR}!;
82+
s!^(ENV HAPROXY_SHA256) .*!\1 ${HAPROXY_SHA256}!
83+
s!^(ENV DATAPLANE_MINOR) .*!\1 ${DATAPLANE_MINOR}!
84+
s!^(ENV DATAPLANE_V2_MINOR) .*!\1 ${DATAPLANE_V2_MINOR}!" \
85+
"${DOCKERFILE_API}"
86+
fi

0 commit comments

Comments
 (0)