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

Fix docker builds #21100

Merged
merged 1 commit into from
Jul 25, 2022
Merged

Fix docker builds #21100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions .github/workflows/docker_img.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,3 @@ jobs:
run: |
cd integrations/docker/images/chip-build${{ matrix.img }}
./build.sh --latest
- name: Scan for vulnerabilities
uses: crazy-max/docker-scan-action@master
with:
# NOTE: This task validates the images built previously with latest tag
image: connectedhomeip/chip-build${{ matrix.img }}:latest
annotations: true
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-crosscompile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
git=1:2.25.1-1ubuntu3.4 \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
8 changes: 4 additions & 4 deletions integrations/docker/images/chip-build-doxygen/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.15

RUN apk --no-cache add \
doxygen=1.9.2-r1 \
graphviz=2.49.3-r0 \
bash=5.1.16-r0 \
git=2.34.2-r0
doxygen=1.9.2-r1 \
graphviz=2.49.3-r0 \
bash \
git
4 changes: 1 addition & 3 deletions integrations/docker/images/chip-build-esp32-qemu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ FROM connectedhomeip/chip-build-esp32:${VERSION}
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
ninja-build=1.10.0-1build1 \
git=1:2.25.1-1ubuntu3.4 \
libgcrypt20-dev=1.8.5-5ubuntu1.1 \
ninja-build git libgcrypt20-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-esp32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
git=1:2.25.1-1ubuntu3.4 \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-imx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu2 \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
3 changes: 1 addition & 2 deletions integrations/docker/images/chip-build-k32w/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu2 \
unzip=6.0-25ubuntu1 \
wget unzip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-mbed-os/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu2 \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-nrf-platform/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG NCS_REVISION=fd5905aa6b04febd99d00dba6c482ac25eb15222
RUN set -x \
&& apt-get update \
&& apt-get install --no-install-recommends -fy \
curl=7.68.0-1ubuntu2.11 \
curl \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-telink/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} as build
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu2 \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-ti/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION}
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu2 \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
4 changes: 2 additions & 2 deletions integrations/docker/images/chip-build-tizen/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN set -x \
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
cpio=2.13+dfsg-2 \
obs-build=20180831-3ubuntu1 \
cpio \
obs-build \
openjdk-8-jre-headless \
zip \
# Cleanup
Expand Down
2 changes: 0 additions & 2 deletions integrations/docker/images/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aar

COPY --from=ameba /opt/ameba /opt/ameba

COPY --from=k32w /opt/sdk/sdks /opt/sdk/sdks
woody-apple marked this conversation as resolved.
Show resolved Hide resolved

COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland

COPY --from=ti /opt/ti/sysconfig_1.11.0 /opt/ti/sysconfig_1.11.0
Expand Down