Skip to content

Commit

Permalink
ci: move to alpine 3.18 base
Browse files Browse the repository at this point in the history
Signed-off-by: Ernesto Ojeda <[email protected]>
  • Loading branch information
ernestojeda committed Oct 31, 2023
1 parent 753c0e6 commit 61fff11
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions scripts/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
# limitations under the License.
#

ARG BASE=alpine:3.16
ARG BASE=alpine:3.18
FROM ${BASE}
LABEL maintainer="IOTech <[email protected]>"
RUN wget https://iotech.jfrog.io/artifactory/api/security/keypair/public/repositories/alpine-release -O /etc/apk/keys/alpine.dev.rsa.pub
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.16/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml-dev curl-dev libmicrohttpd-dev util-linux-dev ncurses-dev libcbor-dev paho-mqtt-c-dev-1.3 hiredis-dev iotech-iot-1.5-dev && mkdir -p /edgex-c-sdk/build
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.18/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml-dev curl-dev libmicrohttpd-dev util-linux-dev ncurses-dev libcbor-dev iotech-paho-mqtt-c-dev-1.3 hiredis-dev iotech-iot-1.5-dev && mkdir -p /edgex-c-sdk/build
COPY VERSION /edgex-c-sdk/
COPY src /edgex-c-sdk/src/
COPY include /edgex-c-sdk/include/
Expand Down
10 changes: 5 additions & 5 deletions scripts/Dockerfile.alpine-base
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.
#

ARG BASE=alpine:3.16
ARG BASE=alpine:3.18
FROM ${BASE} as builder
RUN wget https://iotech.jfrog.io/artifactory/api/security/keypair/public/repositories/alpine-release -O /etc/apk/keys/alpine.dev.rsa.pub
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.16/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml-dev curl-dev libmicrohttpd-dev util-linux-dev ncurses-dev libcbor-dev paho-mqtt-c-dev-1.3 iotech-iot-1.5-dev hiredis-dev
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.18/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml-dev curl-dev libmicrohttpd-dev util-linux-dev ncurses-dev libcbor-dev iotech-paho-mqtt-c-dev-1.3 iotech-iot-1.5-dev hiredis-dev

RUN mkdir /tmp/sdk
COPY VERSION /tmp/sdk
Expand All @@ -35,8 +35,8 @@ FROM ${BASE}
LABEL maintainer="IOTech <[email protected]>"

RUN wget https://iotech.jfrog.io/artifactory/api/security/keypair/public/repositories/alpine-release -O /etc/apk/keys/alpine.dev.rsa.pub
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.16/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml curl libmicrohttpd libuuid libcbor paho-mqtt-c-dev-1.3 iotech-iot-1.4 hiredis-dev
RUN echo 'https://iotech.jfrog.io/artifactory/alpine-release/v3.18/main' >> /etc/apk/repositories
RUN apk add --update --no-cache binutils gcc libc-dev make git cmake yaml curl libmicrohttpd libuuid libcbor iotech-paho-mqtt-c-dev-1.3 iotech-iot-1.5 hiredis-dev

COPY --from=builder /usr/local/include/edgex /usr/local/include/edgex
COPY --from=builder /usr/local/lib /usr/local/lib
Expand Down

0 comments on commit 61fff11

Please sign in to comment.