You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by GitBox <gi...@apache.org> on 2022/07/21 19:18:09 UTC
[GitHub] [daffodil] stevedlawrence opened a new pull request, #816: Improve release candidate container build cachability and reproducability
stevedlawrence opened a new pull request, #816:
URL: https://github.com/apache/daffodil/pull/816
The release candidate container setup script makes reusing cached image
layers difficult because any change to the setup script (e.g. sbt/npm
version) invalidates the previous cached layers. This means anytime a
change is made to this script the entire container image must be rebuilt
which takes a lot of time and wasted space.
To avoid this, the container setup script is removed and all
functionality is moved to the Dockerfile. This results in more layers,
but makes it less likely to need to rebuild layers if there are changes.
Commands that are more likely to change due to versions or contents
(e.g. sbt/yarn install, release-candidate script) are put closer to the
end so if they are changed, less needs to be rebuilt.
More importantly, the installation of yarn and sbt do not provide a
specific version, so the version in the container depends on the latest
version available in the npm/sbt repositories when the container is
built. To improve reproducability, they are changed to install a
pinned version (the latest versions as of this change).
Additional minor updates to the container:
- Switch from fedora-minimal to fedora. The size difference is minimal
compared to the final size of the container, and it replaces microdnf
with dnf, which has more capabilities to make the Dockerfile cleaner,
(e.g. quieter build, repo/repofrompath options).
- Add the "--group-add keep-groups" option to the podman run command
needed for newer versions of podman.
- Some files only need to be verified when building Daffodil and not VS
Code, only mention the correct files to avoid confusion.
- Update sbt-pgp plugin to latest version
- Update wix_wine.sh to remove debug message that SBT makes look like
errors.
DAFFODIL-2713
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r928001792
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
+RUN \
+ dnf -y --quiet --repo=fedora install \
+ clang \
+ git \
+ java-1.8.0-devel \
Review Comment:
I know of systems that unfortunately still use Java 8. I prefer we continue with this just to ensure no compatibility issues, unless there's a good reason..
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r928000415
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
Review Comment:
Hmmm, good point. I was targeting reproducibility and cachability with this change. We've definitely had cases (I recall one with `wine`) where an updated package broke and we didn't find out until we were going to release, and it was a bit of a hassle to fix.
After doing some research it looks like `dnf upgrade` has a `--security` flag, which will cause it to only upgrade packages with security updates. Maybe that's a good happy medium of reproducibility and security?
That said, even with something like `--security`, because of the way layer caching works it is still possible to use a cached layer that that has CVE issues. The only way to guarantee no known CVE issues is to delete the existing container. The goal with this change was so you don't have to delete the container and make builds quicker.
Additionally, all the dependencies that we package with Daffodil come from maven/npm. I don't think we really distribute anything that comes from Fedora so I would think it's pretty unlikely for a Fedora package with a CVE to actually affect Daffodil. And the script that runs in the container is reviewed by us, so it feels unlikely for any CVE's to actually be exploitable. I guess potentially the java compiler could have CVE's that generates bad byte code or something, but again, that feels pretty unlikely.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence merged pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged PR #816:
URL: https://github.com/apache/daffodil/pull/816
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] Shanedell commented on pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
Shanedell commented on PR #816:
URL: https://github.com/apache/daffodil/pull/816#issuecomment-1192680281
@stevedlawrence The changes being done here look pretty good to me. Is then any other process you would like me to do before approving? Like would you like me to pull this down locally and give it a test run to make sure stuff was working up to a certain point?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on PR #816:
URL: https://github.com/apache/daffodil/pull/816#issuecomment-1192694590
It's up to each individual committer how they choose to review, so I'll leave it up to you and others.
But if anyone wants to do a test, a good test would be to check out this PR and follow the steps in the release-candidate README.md to build and run the container (making sure to add the `--dry-run` option to the end of the run command). There shouldn't be anything that looks like an error and the release artifacts should be created. Because it's a dry run, nothing will get published and everything will be erased when you exit the container.
Any additional test to show the layer caching is working correctly is to modify the `Dockerfile` to use a slightly older yarn/sbt version and rebuild/run the container. The second build should be significantly faster than the first if layers are caching correctly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r928793198
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
+RUN \
+ dnf -y --quiet --repo=fedora install \
+ clang \
+ git \
+ java-1.8.0-devel \
+ llvm \
+ mxml-devel \
+ npm \
+ pinentry \
+ rpm-build \
+ rpm-sign \
+ subversion \
+ unzip \
+ vim-minimal \
+ wine \
+ winetricks && \
+ dnf clean all
+
+# Enable SBT pgp plugin
+COPY src/plugins.sbt /root/.sbt/1.0/plugins/
+
+# Install wix, including changes to allow WiX to run in wine on Linux. See
+# src/wix_wine.sh for more details on why we need to do this and how it works
+RUN \
+ curl -sS -L https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -o wix311-binaries.zip && \
+ echo "6fd961c85e1e6adafb99ef50c9659e3eb83c84ecaf49f523e556788845b206e1857aba2c39409405d4cda1df9b30a552ce5aab808be5f8368a37a447d78d1a05 wix311-binaries.zip" | sha512sum --quiet -c - && \
+ mkdir /opt/wix311 && \
+ unzip -q wix311-binaries.zip -d /opt/wix311/ && \
+ rm wix311-binaries.zip
RUN mv /opt/wix311/{candle.exe,real-candle.exe}
RUN mv /opt/wix311/{light.exe,real-light.exe}
-COPY wix_wine.sh /opt/wix311/candle.exe
-COPY wix_wine.sh /opt/wix311/light.exe
+COPY src/wix_wine.sh /opt/wix311/candle.exe
+COPY src/wix_wine.sh /opt/wix311/light.exe
+
+# Install a pinned version of sbt, needed because the spt-rpm repository
+# frequently adds new versions.
+RUN \
+ dnf -y --quiet --repofrompath=sbt-rpm,https://repo.scala-sbt.org/scalasbt/rpm --repo=sbt-rpm --nogpgcheck install \
+ sbt-1.7.1 && \
Review Comment:
I've added a line in the "prepare" section of the release candidate workflow to check and update the versions. I don't think there's an good automated way of handling this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r929908010
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
Review Comment:
I looked at what `--security` updates are currently available in the container. The full list of packages are below.
Although we use a few of these in the build process (e.g. git, subversion, java), it seems the related security issues require a malicious user or aren't affected by Daffodil's usage. For example, here's the issue related to the java update:
https://access.redhat.com/errata/RHSA-2022:1438
I think I lean towards not updating these packages just to ensure reproducibility and that everyone is building with the exact same system. At least for now until we figure out how best to handle security updates.
```
FEDORA-2022-09a89bc265 Important/Sec. cups-libs-1:2.4.2-1.fc36.i686
FEDORA-2022-09a89bc265 Important/Sec. cups-libs-1:2.4.2-1.fc36.x86_64
FEDORA-2022-d294f36c15 Moderate/Sec. fribidi-1.0.11-3.fc36.i686
FEDORA-2022-d294f36c15 Moderate/Sec. fribidi-1.0.11-3.fc36.x86_64
FEDORA-2022-964883b2a5 Moderate/Sec. giflib-5.2.1-14.fc36.x86_64
FEDORA-2022-dfd7e7fc0e Moderate/Sec. git-2.37.1-1.fc36.x86_64
FEDORA-2022-dfd7e7fc0e Moderate/Sec. git-core-2.37.1-1.fc36.x86_64
FEDORA-2022-dfd7e7fc0e Moderate/Sec. git-core-doc-2.37.1-1.fc36.noarch
FEDORA-2022-27932fdd06 Important/Sec. grub2-common-1:2.06-42.fc36.noarch
FEDORA-2022-27932fdd06 Important/Sec. grub2-tools-1:2.06-42.fc36.x86_64
FEDORA-2022-27932fdd06 Important/Sec. grub2-tools-minimal-1:2.06-42.fc36.x86_64
FEDORA-2022-a32f9488a0 Moderate/Sec. harfbuzz-4.0.0-2.fc36.i686
FEDORA-2022-a32f9488a0 Moderate/Sec. harfbuzz-4.0.0-2.fc36.x86_64
FEDORA-2022-42c08d8bd8 Important/Sec. java-1.8.0-openjdk-1:1.8.0.332.b09-1.fc36.x86_64
FEDORA-2022-42c08d8bd8 Important/Sec. java-1.8.0-openjdk-devel-1:1.8.0.332.b09-1.fc36.x86_64
FEDORA-2022-42c08d8bd8 Important/Sec. java-1.8.0-openjdk-headless-1:1.8.0.332.b09-1.fc36.x86_64
FEDORA-2022-edf7301147 Moderate/Sec. libtiff-4.4.0-2.fc36.i686
FEDORA-2022-edf7301147 Moderate/Sec. libtiff-4.4.0-2.fc36.x86_64
FEDORA-2022-9136d646e4 Moderate/Sec. libxml2-2.9.14-1.fc36.i686
FEDORA-2022-9136d646e4 Moderate/Sec. libxml2-2.9.14-1.fc36.x86_64
FEDORA-2022-8f775872c9 Moderate/Sec. ntfs-3g-2:2022.5.17-1.fc36.x86_64
FEDORA-2022-8f775872c9 Moderate/Sec. ntfs-3g-libs-2:2022.5.17-1.fc36.x86_64
FEDORA-2022-13bc8c91b0 Moderate/Sec. ntfs-3g-system-compression-1.0-9.fc36.x86_64
FEDORA-2022-8f775872c9 Moderate/Sec. ntfsprogs-2:2022.5.17-1.fc36.x86_64
FEDORA-2022-975e21444a Moderate/Sec. openjpeg2-2.4.0-10.fc36.x86_64
FEDORA-2022-3fdc2d3047 Low/Sec. openssl-1:3.0.5-1.fc36.x86_64
FEDORA-2022-3fdc2d3047 Low/Sec. openssl-libs-1:3.0.5-1.fc36.i686
FEDORA-2022-3fdc2d3047 Low/Sec. openssl-libs-1:3.0.5-1.fc36.x86_64
FEDORA-2022-e56085ba31 Unknown/Sec. pcre2-10.40-1.fc36.i686
FEDORA-2022-e56085ba31 Unknown/Sec. pcre2-10.40-1.fc36.x86_64
FEDORA-2022-e56085ba31 Unknown/Sec. pcre2-syntax-10.40-1.fc36.noarch
FEDORA-2022-e56085ba31 Unknown/Sec. pcre2-utf16-10.40-1.fc36.x86_64
FEDORA-2022-dfd7e7fc0e Moderate/Sec. perl-Git-2.37.1-1.fc36.noarch
FEDORA-2022-9da5703d22 Moderate/Sec. python3-3.10.5-2.fc36.x86_64
FEDORA-2022-9da5703d22 Moderate/Sec. python3-libs-3.10.5-2.fc36.x86_64
FEDORA-2022-2af658b090 Important/Sec. subversion-1.14.2-5.fc36.x86_64
FEDORA-2022-2af658b090 Important/Sec. subversion-libs-1.14.2-5.fc36.x86_64
FEDORA-2022-b06fbea2c7 Low/Sec. vim-data-2:9.0.049-1.fc36.noarch
FEDORA-2022-b06fbea2c7 Low/Sec. vim-minimal-2:9.0.049-1.fc36.x86_64
FEDORA-2022-7df99d9f80 Moderate/Sec. wavpack-5.4.0-5.fc36.i686
FEDORA-2022-7df99d9f80 Moderate/Sec. wavpack-5.4.0-5.fc36.x86_64
FEDORA-2022-fdb75e7766 Moderate/Sec. webkit2gtk3-jsc-2.36.4-1.fc36.x86_64
FEDORA-2022-a7ceb864fd Low/Sec. zchunk-libs-1.2.2-1.fc36.x86_64
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r928004079
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
+RUN \
+ dnf -y --quiet --repo=fedora install \
+ clang \
+ git \
+ java-1.8.0-devel \
+ llvm \
+ mxml-devel \
+ npm \
+ pinentry \
+ rpm-build \
+ rpm-sign \
+ subversion \
+ unzip \
+ vim-minimal \
+ wine \
+ winetricks && \
+ dnf clean all
+
+# Enable SBT pgp plugin
+COPY src/plugins.sbt /root/.sbt/1.0/plugins/
+
+# Install wix, including changes to allow WiX to run in wine on Linux. See
+# src/wix_wine.sh for more details on why we need to do this and how it works
+RUN \
+ curl -sS -L https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -o wix311-binaries.zip && \
+ echo "6fd961c85e1e6adafb99ef50c9659e3eb83c84ecaf49f523e556788845b206e1857aba2c39409405d4cda1df9b30a552ce5aab808be5f8368a37a447d78d1a05 wix311-binaries.zip" | sha512sum --quiet -c - && \
+ mkdir /opt/wix311 && \
+ unzip -q wix311-binaries.zip -d /opt/wix311/ && \
+ rm wix311-binaries.zip
RUN mv /opt/wix311/{candle.exe,real-candle.exe}
RUN mv /opt/wix311/{light.exe,real-light.exe}
-COPY wix_wine.sh /opt/wix311/candle.exe
-COPY wix_wine.sh /opt/wix311/light.exe
+COPY src/wix_wine.sh /opt/wix311/candle.exe
+COPY src/wix_wine.sh /opt/wix311/light.exe
+
+# Install a pinned version of sbt, needed because the spt-rpm repository
+# frequently adds new versions.
+RUN \
+ dnf -y --quiet --repofrompath=sbt-rpm,https://repo.scala-sbt.org/scalasbt/rpm --repo=sbt-rpm --nogpgcheck install \
+ sbt-1.7.1 && \
Review Comment:
Good point. Dependabot knows how to update Dockerfile base images, but I don't think it is smart enough to update the npm/dnf commands. This might be something we just need to check during releases, or try to remember to do when we get related pull requests.
Note that it probably won't matter too much in practice if we don't update these. All dependency versions are defined in the repos (including SBT, not sure about yarn).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] tuxji commented on a diff in pull request #816: Improve release candidate container build cachability and reproducability
Posted by GitBox <gi...@apache.org>.
tuxji commented on code in PR #816:
URL: https://github.com/apache/daffodil/pull/816#discussion_r927932971
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
Review Comment:
This command will return an error status if /root contains any visible (not hidden) directories. If you run `rm -rf /root/*` instead, it will not return any error status.
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
Review Comment:
We risk building a Fedora container with a CVE vulnerability fixed by the updates repo. I'm not sure disabling the updates repo is worth that risk, although we would need to run `dnf upgrade` as well to apply all the patches correctly.
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
+RUN \
+ dnf -y --quiet --repo=fedora install \
+ clang \
+ git \
+ java-1.8.0-devel \
+ llvm \
+ mxml-devel \
+ npm \
+ pinentry \
+ rpm-build \
+ rpm-sign \
+ subversion \
+ unzip \
+ vim-minimal \
+ wine \
+ winetricks && \
+ dnf clean all
+
+# Enable SBT pgp plugin
+COPY src/plugins.sbt /root/.sbt/1.0/plugins/
+
+# Install wix, including changes to allow WiX to run in wine on Linux. See
+# src/wix_wine.sh for more details on why we need to do this and how it works
+RUN \
+ curl -sS -L https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -o wix311-binaries.zip && \
+ echo "6fd961c85e1e6adafb99ef50c9659e3eb83c84ecaf49f523e556788845b206e1857aba2c39409405d4cda1df9b30a552ce5aab808be5f8368a37a447d78d1a05 wix311-binaries.zip" | sha512sum --quiet -c - && \
+ mkdir /opt/wix311 && \
+ unzip -q wix311-binaries.zip -d /opt/wix311/ && \
+ rm wix311-binaries.zip
RUN mv /opt/wix311/{candle.exe,real-candle.exe}
RUN mv /opt/wix311/{light.exe,real-light.exe}
-COPY wix_wine.sh /opt/wix311/candle.exe
-COPY wix_wine.sh /opt/wix311/light.exe
+COPY src/wix_wine.sh /opt/wix311/candle.exe
+COPY src/wix_wine.sh /opt/wix311/light.exe
+
+# Install a pinned version of sbt, needed because the spt-rpm repository
+# frequently adds new versions.
+RUN \
+ dnf -y --quiet --repofrompath=sbt-rpm,https://repo.scala-sbt.org/scalasbt/rpm --repo=sbt-rpm --nogpgcheck install \
+ sbt-1.7.1 && \
Review Comment:
When and how do you propose we bump these pinned versions of sbt and yarn? Add a bullet item to the release checklist to bump sbt and yarn to their latest versions whenever we make a new release?
##########
containers/release-candidate/Dockerfile:
##########
@@ -15,20 +15,61 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:36
+FROM registry.fedoraproject.org/fedora:36
WORKDIR /root
-COPY setup-container.sh /usr/bin/
-RUN /usr/bin/setup-container.sh
+# Delete cruft fedora leaves in the homedir
+RUN rm /root/*
-# Needed to get WiX to run in wine on Linux. See wix_wine.sh for more details
-# on why we need to do this and how it works
+# Install dependencies, explicitly not enabling the updates repo so we are
+# pinned at a particular fedora release.
+RUN \
+ dnf -y --quiet --repo=fedora install \
+ clang \
+ git \
+ java-1.8.0-devel \
Review Comment:
Java 8 is pretty close to end of life. Would Java 11 work here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org