Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump github.com/docker/docker from 20.10.24+incompatible to 24.0.7+incompatible #35

Merged
merged 4 commits into from
Oct 31, 2023
Merged

build(deps): bump github.com/docker/docker from 20.10.24+incompatible to 24.0.7+incompatible #35

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
693b6d1
build(deps): bump github.com/docker/docker
dependabot[bot] Oct 30, 2023
75d1aaf
fix: upgrading testcontainers
antoniomtz Oct 30, 2023
9b65675
fix: updating golang and docker images
antoniomtz Oct 30, 2023
3b04591
updating github pages
antoniomtz Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions as-file-receiver-oem/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
########################################################################

#build stage
FROM golang:1.19-alpine3.16 AS builder
FROM golang:1.21.3-alpine3.17 AS builder

RUN apk add --update --no-cache make=4.3-r0 gcc=11.2.1_git20220219-r2 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r0 \
zeromq-dev=4.3.4-r0
RUN apk add --update --no-cache make=4.3-r1 gcc=12.2.1_git20220924-r4 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r2 zeromq-dev=4.3.4-r1
WORKDIR /app

COPY go.mod ./
Expand All @@ -18,7 +17,7 @@ ARG MAKE="make file-receiver-oem"
RUN $MAKE

#final stage
FROM alpine:3.16
FROM alpine:3.17
LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
copyright='Copyright (c) 2023: Intel Corporation'
LABEL name='as-file-receiver-oem' \
Expand All @@ -29,7 +28,7 @@ COPY --from=builder /app/as-file-receiver-oem/res/ /res/
COPY --from=builder /app/as-file-receiver-oem/as-file-receiver-oem /as-file-receiver-oem

# dumb-init is required as security-bootstrapper uses it in the entrypoint script
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r0 dumb-init=1.2.5-r1
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r1 dumb-init=1.2.5-r2

EXPOSE 59787

Expand Down
8 changes: 4 additions & 4 deletions as-file-sender-gateway/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
########################################################################

# build stage
FROM golang:1.19-alpine3.16 AS builder
FROM golang:1.21.3-alpine3.17 AS builder

RUN apk add --update --no-cache make=4.3-r0 gcc=11.2.1_git20220219-r2 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r0 zeromq-dev=4.3.4-r0
RUN apk add --update --no-cache make=4.3-r1 gcc=12.2.1_git20220924-r4 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r2 zeromq-dev=4.3.4-r1
WORKDIR /app

COPY go.mod ./
Expand All @@ -17,14 +17,14 @@ ARG MAKE="make file-sender-gateway"
RUN $MAKE

# final stage
FROM alpine:3.16
FROM alpine:3.17
LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
copyright='Copyright (c) 2023: Intel Corporation'
LABEL name='as-file-sender-gateway' \
version="${MSVERSION}"

# dumb-init is required as security-bootstrapper uses it in the entrypoint script
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r0 dumb-init=1.2.5-r1
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r1 dumb-init=1.2.5-r2

COPY --from=builder /app/as-file-sender-gateway/LICENSE /LICENSE
COPY --from=builder /app/as-file-sender-gateway/res/ /res/
Expand Down
8 changes: 4 additions & 4 deletions as-pipeline-sim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
########################################################################

#build stage
FROM golang:1.19-alpine3.16 AS builder
FROM golang:1.21.3-alpine3.17 AS builder

RUN apk add --update --no-cache make=4.3-r0 gcc=11.2.1_git20220219-r2 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r0 zeromq-dev=4.3.4-r0
RUN apk add --update --no-cache make=4.3-r1 gcc=12.2.1_git20220924-r4 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r2 zeromq-dev=4.3.4-r1
WORKDIR /app

COPY go.mod ./
Expand All @@ -17,14 +17,14 @@ ARG MAKE="make pipeline-sim"
RUN $MAKE

#final stage
FROM alpine:3.16
FROM alpine:3.17
LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
copyright='Copyright (c) 2023: Intel Corporation'
LABEL name='as-pipeline-sim' \
version="${MSVERSION}"

# dumb-init is required as security-bootstrapper uses it in the entrypoint script
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r0 dumb-init=1.2.5-r1
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r1 dumb-init=1.2.5-r2

# COPY --from=builder /app/Attribution.txt /Attribution.txt
COPY --from=builder /app/as-pipeline-sim/LICENSE /LICENSE
Expand Down
8 changes: 4 additions & 4 deletions as-pipeline-val/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
########################################################################

# build stage
FROM golang:1.19-alpine3.16 AS builder
FROM golang:1.21.3-alpine3.17 AS builder

RUN apk add --update --no-cache make=4.3-r0 gcc=11.2.1_git20220219-r2 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r0 zeromq-dev=4.3.4-r0
RUN apk add --update --no-cache make=4.3-r1 gcc=12.2.1_git20220924-r4 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r2 zeromq-dev=4.3.4-r1
WORKDIR /app

COPY go.mod ./
Expand All @@ -17,14 +17,14 @@ ARG MAKE="make pipeline-val"
RUN $MAKE

# final stage
FROM alpine:3.16
FROM alpine:3.17
LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
copyright='Copyright (c) 2023: Intel Corporation'
LABEL name='as-pipeline-val' \
version="${MSVERSION}"

# dumb-init is required as security-bootstrapper uses it in the entrypoint script
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r0 dumb-init=1.2.5-r1
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r1 dumb-init=1.2.5-r2

# COPY --from=builder /app/Attribution.txt /Attribution.txt
COPY --from=builder /app/as-pipeline-val/LICENSE /LICENSE
Expand Down
8 changes: 4 additions & 4 deletions as-task-launcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
########################################################################

# build stage
FROM golang:1.19-alpine3.16 AS builder
FROM golang:1.21.3-alpine3.17 AS builder

RUN apk add --update --no-cache make=4.3-r0 gcc=11.2.1_git20220219-r2 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r0 zeromq-dev=4.3.4-r0
RUN apk add --update --no-cache make=4.3-r1 gcc=12.2.1_git20220924-r4 libc-dev=0.7.2-r3 libsodium-dev=1.0.18-r2 zeromq-dev=4.3.4-r1
WORKDIR /app

COPY go.mod ./
Expand All @@ -17,15 +17,15 @@ ARG MAKE="make task-launcher"
RUN $MAKE

# final stage
FROM alpine:3.16
FROM alpine:3.17
# TODO: Change Copyright to your company if open sourcing or remove label
LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
copyright='Copyright (c) 2023: Intel Corporation'
LABEL name='as-task-launcher' \
version="${MSVERSION}"

# dumb-init is required as security-bootstrapper uses it in the entrypoint script
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r0 dumb-init=1.2.5-r1
RUN apk add --update --no-cache ca-certificates=20230506-r0 zeromq=4.3.4-r1 dumb-init=1.2.5-r2

COPY --from=builder /app/as-task-launcher/LICENSE /LICENSE
COPY --from=builder /app/as-task-launcher/res/ /res/
Expand Down
2 changes: 1 addition & 1 deletion docs_src/getting-started/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This guide contains troubleshooting for common issues and errors.
When building the Docker containers, if the build fails with an error message like:

```bash
ERROR: failed to solve: golang:1.19-alpine3.16: failed to do request: Head "https://registry-1.docker.io/v2/library/golang/manifests/1.19-alpine3.16": dial tcp: lookup registry-1.docker.io on 127.0.0.53:53: read udp 127.0.0.1:35314->127.0.0.53:53: i/o timeout
ERROR: failed to solve: golang:1.21.3-alpine3.17: failed to do request: Head "https://registry-1.docker.io/v2/library/golang/manifests/1.19-alpine3.16": dial tcp: lookup registry-1.docker.io on 127.0.0.53:53: read udp 127.0.0.1:35314->127.0.0.53:53: i/o timeout
make: *** [Makefile:106: docker-job-repository] Error 1
```

Expand Down
2 changes: 1 addition & 1 deletion edgex-res/oem-ssh-proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
# ----------------------------------------------------------------------------------

FROM alpine:3.16
FROM alpine:3.17

RUN apk add --no-cache --update dumb-init openssl openssh-client && rm -rf /var/cache/apk/*

Expand Down
Loading
Loading