Skip to content

Commit 2caaf1a

Browse files
SimenBSimenB
committed
maybe fix arm?
1 parent 71849fa commit 2caaf1a

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

‎10/buster-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.21.1
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎10/jessie-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.21.1
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎10/stretch-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.21.1
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎12/buster-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.22.0
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎12/stretch-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.22.0
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎13/buster-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.21.1
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎13/stretch-slim/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5859
ENV YARN_VERSION 1.21.1
5960

6061
RUN set -ex \
62+
&& savedAptMark="$(apt-mark showmanual)" \
6163
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
6264
&& rm -rf /var/lib/apt/lists/* \
6365
&& for key in \
@@ -76,6 +78,7 @@ RUN set -ex \
7678
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
7779
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
7880
&& apt-mark auto '.*' > /dev/null \
81+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
7982
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
8083
| awk '/=>/ { print $(NF-1) }' \
8184
| sort -u \

‎Dockerfile-slim.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& set -ex \
19-
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \
19+
# libatomic1 for arm
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
2021
&& rm -rf /var/lib/apt/lists/* \
2122
&& for key in \
2223
"${NODE_KEYS[@]}"
@@ -48,6 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4849
ENV YARN_VERSION 0.0.0
4950

5051
RUN set -ex \
52+
&& savedAptMark="$(apt-mark showmanual)" \
5153
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
5254
&& rm -rf /var/lib/apt/lists/* \
5355
&& for key in \
@@ -66,6 +68,7 @@ RUN set -ex \
6668
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6769
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6870
&& apt-mark auto '.*' > /dev/null \
71+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
6972
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
7073
| awk '/=>/ { print $(NF-1) }' \
7174
| sort -u \

0 commit comments

Comments
 (0)