From 620f8c8958ad83a9c30c233beb61a8b6d768645d Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 19 Dec 2023 12:26:35 -0500 Subject: [PATCH] Get JSYaml package file to help attestation generation --- 4.4-rc/Dockerfile | 5 ++++- 4.4/Dockerfile | 5 ++++- 5.0/Dockerfile | 5 ++++- 6.0/Dockerfile | 5 ++++- 7.0/Dockerfile | 5 ++++- Dockerfile-linux.template | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/4.4-rc/Dockerfile b/4.4-rc/Dockerfile index bde6d5a07e..4b1aa90f72 100644 --- a/4.4-rc/Dockerfile +++ b/4.4-rc/Dockerfile @@ -47,7 +47,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index ec28ab1d4d..997ce1ca99 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -47,7 +47,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \ diff --git a/5.0/Dockerfile b/5.0/Dockerfile index 45b124f505..b6047f9257 100644 --- a/5.0/Dockerfile +++ b/5.0/Dockerfile @@ -47,7 +47,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \ diff --git a/6.0/Dockerfile b/6.0/Dockerfile index 3345237faf..8a3e0b1190 100644 --- a/6.0/Dockerfile +++ b/6.0/Dockerfile @@ -47,7 +47,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 5592c3abad..eb14ca4aa4 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -47,7 +47,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 883e46df65..59139de0b2 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -42,7 +42,10 @@ RUN set -ex; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ - wget -O /js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + mkdir -p /opt/js-yaml/; \ + wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ + wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ + ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ # TODO some sort of download verification here \ apt-mark auto '.*' > /dev/null; \