@@ -54,43 +54,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5454      | xargs -r apt-mark manual \
5555    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
5656    && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
57+     && corepack enable \
5758    #  smoke tests
5859    && node --version \
5960    && npm --version
6061
61- ENV  YARN_VERSION 1.22.19
62- 
63- RUN  set -ex \
64-   && savedAptMark="$(apt-mark showmanual)"  \
65-   && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
66-   && rm -rf /var/lib/apt/lists/* \
67-   && for key in \
68-     6A010C5166006599AA17F08146C2130DFD2497F5 \
69-   ; do \
70-     gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key"  || \
71-     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"  ; \
72-   done \
73-   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz"  \
74-   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc"  \
75-   && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
76-   && mkdir -p /opt \
77-   && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
78-   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
79-   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
80-   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
81-   && apt-mark auto '.*'  > /dev/null \
82-   && { [ -z "$savedAptMark"  ] || apt-mark manual $savedAptMark > /dev/null; } \
83-   && find /usr/local -type f -executable -exec ldd '{}'  ';'  \
84-     | awk '/=>/ { print $(NF-1) }'  \
85-     | sort -u \
86-     | xargs -r dpkg-query --search \
87-     | cut -d: -f1 \
88-     | sort -u \
89-     | xargs -r apt-mark manual \
90-   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
91-   #  smoke test
92-   && yarn --version
93- 
9462COPY  docker-entrypoint.sh /usr/local/bin/
9563ENTRYPOINT  ["docker-entrypoint.sh" ]
9664
0 commit comments