Fixed tebako setup

tamatebako · Jun 28, 2024 · a94cdcb · a94cdcb
1 parent 4cb3508
commit a94cdcb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/alpine-3.17.Dockerfile b/alpine-3.17.Dockerfile
@@ -43,8 +43,6 @@ RUN apk --no-cache --upgrade add build-base cmake git bash sudo  \
 ENV CC=clang
 ENV CXX=clang++
 
-RUN gem install tebako
-
 # https://github.com/actions/checkout/issues/1014
 # RUN adduser --disabled-password --gecos "" --home $HOME tebako && \
 #    printf "\ntebako\tALL=(ALL)\tNOPASSWD:\tALL" > /etc/sudoers.d/tebako
@@ -53,11 +51,12 @@ RUN gem install tebako
 
 # So we are running as root, HOME=/root, tebako prefix (default) /root/.tebako
 
-COPY test $HOME/test
+COPY test /root/test
 
 # Create packaging environment for Ruby 3.1.6, 3.2.4
 # Test and "warm up" since initialization is fully finished after the first packaging
-RUN tebako setup -R 3.1.6 && \
+RUN gem install tebako && \
+    tebako setup -R 3.1.6 && \
     tebako setup -R 3.2.4 && \
     tebako press -R 3.1.6 -r test -e tebako-test-run.rb -o ruby-3.1.6-package && \
     tebako press -R 3.2.4 -r test -e tebako-test-run.rb -o ruby-3.2.4-package && \

diff --git a/ubuntu-20.04.Dockerfile b/ubuntu-20.04.Dockerfile
@@ -47,8 +47,6 @@ COPY tools /opt/tools
 RUN /opt/tools/tools.sh install_cmake && \
     /opt/tools/tools.sh install_ruby
 
-RUN gem install tebako
-
 # https://github.com/actions/checkout/issues/1014
 # RUN adduser --disabled-password --gecos "" --home $HOME tebako && \
 #    printf "\ntebako\tALL=(ALL)\tNOPASSWD:\tALL" > /etc/sudoers.d/tebako
@@ -57,14 +55,15 @@ RUN gem install tebako
 
 # So we are running as root, HOME=/root, tebako prefix (default) /root/.tebako
 
-COPY test $HOME/test
+COPY test /root/test
 
 # Create packaging environment for Ruby 3.1.6, 3.2.4
 # Test and "warm up" since initialization is fully finished after the first packaging
-RUN tebako setup -R 3.1.6 && \
+RUN gem install tebako && \
+    tebako setup -R 3.1.6 && \
     tebako setup -R 3.2.4 && \
-    tebako press -R 3.1.6 -r test -e tebako-test-run.rb -o ruby-3.1.6-package && \
-    tebako press -R 3.2.4 -r test -e tebako-test-run.rb -o ruby-3.2.4-package && \
+    tebako press -R 3.1.6 -r /root/test -e tebako-test-run.rb -o ruby-3.1.6-package && \
+    tebako press -R 3.2.4 -r /root/test -e tebako-test-run.rb -o ruby-3.2.4-package && \
     rm ruby-*-package
 
 ENV PS1=PS1="\[\]\[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ \[\]"