This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 690ea80 Fixes to release candidate container
690ea80 is described below
commit 690ea80d702456f450884194fdcaf3714f1ddf91
Author: Steve Lawrence <[email protected]>
AuthorDate: Tue Apr 27 09:10:56 2021 -0400
Fixes to release candidate container
- Update release candidate container to Fedora 34. This is much newer an
provides packages for new runtime2 dependencies
- Install pinentry and set a UTF-8 LANG, needed to get gpg signing to
work in newer fedora
- Install clang, llvm-ar, and mxml-devel. Building a release candidate
compiles runtime2 libraries, so a compiler and mxml lib is required.
Set CC/AR variables to use clang/llvm
- Update to latest version of wix toolset for building the MSI
- Update SBT rpm repo location. Bintray has been deprecated, the SBT rpm
is now self hosted.
- Specify a branch when init-ing the test git repo to hide a warning
about changes to default git branch names
- Update README to run the container in privileged mode. The Fedora 34
container uses modern system calls (e.g. futex_time64) that seccomp
policies in Fedora 33 and other container hosts may not know about and
not include in the whitelist. This means these syscalls will be
blocked and cause failures that are difficult to track down and
resolve. To avoid this issue, just run the container in privileged
mode--the contents of the container are fairly trusted to not do
anything bad, and they are still "contained" to some degree.
DAFFODIL-2506
---
containers/release-candidate/Dockerfile | 2 +-
containers/release-candidate/README.md | 2 +-
.../release-candidate/daffodil-release-candidate | 7 +++--
containers/release-candidate/setup-container.sh | 31 +++++++++++++++++++---
4 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/containers/release-candidate/Dockerfile
b/containers/release-candidate/Dockerfile
index 352b09c..aeb5dd1 100644
--- a/containers/release-candidate/Dockerfile
+++ b/containers/release-candidate/Dockerfile
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM registry.fedoraproject.org/fedora-minimal:30
+FROM registry.fedoraproject.org/fedora-minimal:34
WORKDIR /root
diff --git a/containers/release-candidate/README.md
b/containers/release-candidate/README.md
index e675e54..a7d589d 100644
--- a/containers/release-candidate/README.md
+++ b/containers/release-candidate/README.md
@@ -27,7 +27,7 @@ To build the Daffodil release candidate container image:
To use the container image to build a release run the following:
- podman run -it \
+ podman run -it --privileged \
-v ~/.gitconfig:/root/.gitconfig \
-v ~/.gnupg/:/root/.gnupg/ \
-v ~/.ssh/:/root/.ssh/ \
diff --git a/containers/release-candidate/daffodil-release-candidate
b/containers/release-candidate/daffodil-release-candidate
index a217b1f..414c171 100755
--- a/containers/release-candidate/daffodil-release-candidate
+++ b/containers/release-candidate/daffodil-release-candidate
@@ -77,6 +77,9 @@ fi
export GPG_TTY=$(tty)
export WIX=/root/wix311/
+export LANG=en_US.UTF-8
+export CC=clang
+export AR=llvm-ar
read -p "Pre Release label (e.g. rc1): " PRE_RELEASE
@@ -112,8 +115,8 @@ fi
TEST_GIT_DIR=/tmp/test-git-sign
mkdir -p $TEST_GIT_DIR
pushd $TEST_GIT_DIR &> /dev/null
-git init .
-git commit --allow-empty --allow-empty-message -m "test"
+git init -b main .
+git commit --allow-empty --allow-empty-message -m "Test Commit"
git tag -as -u $PGP_SIGNING_KEY_ID -m "Test Signed Tag" test-tag
if [ $? -ne 0 ]; then
echo -e "\n!!! Unable to sign git tag with given key: $PGP_SIGNING_KEY
!!!\n"
diff --git a/containers/release-candidate/setup-container.sh
b/containers/release-candidate/setup-container.sh
index 8e6a5d6..23dae4a 100755
--- a/containers/release-candidate/setup-container.sh
+++ b/containers/release-candidate/setup-container.sh
@@ -21,12 +21,35 @@ export WINEDEBUG=-all
#delete stuff in homedir
rm ~/*
-#install dependencies
-curl https://bintray.com/sbt/rpm/rpm -o /etc/yum.repos.d/bintray-sbt-rpm.repo
-microdnf install git svn sbt java-1.8.0-devel wine winetricks unzip rpm-build
rpm-sign vim-minimal
+# sbt rpm is self hosted
+cat <<EOF > /etc/yum.repos.d/sbt-rpm.repo
+[sbt-rpm]
+name=sbt-rpm
+baseurl=https://repo.scala-sbt.org/scalasbt/rpm
+gpgcheck=0
+repo_gpgcheck=0
+enabled=1
+EOF
+
+# install dependencies
+microdnf -y install \
+ clang \
+ git \
+ java-1.8.0-devel \
+ llvm \
+ mxml-devel \
+ pinentry \
+ rpm-build \
+ rpm-sign \
+ sbt \
+ subversion \
+ unzip \
+ vim-minimal \
+ wine \
+ winetricks
# install wix
-curl -L
https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip
-o wix311-binaries.zip
+curl -L
https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip
-o wix311-binaries.zip
mkdir wix311
unzip wix311-binaries.zip -d wix311/
rm wix311-binaries.zip
