use minimal test for containers

MFTabriz · Jun 3, 2023 · 328c140 · 328c140
1 parent 6507d88
commit 328c140
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/.woodpecker/.ci_containers.yml b/.woodpecker/.ci_containers.yml
@@ -11,15 +11,10 @@ pipeline:
     commands:
       - echo ${CONTAINER_BASE}
       - ls -lah ci/dockerfile.${CONTAINER_BASE}
-      - /kaniko/executor --context . --dockerfile ci/dockerfile.${CONTAINER_BASE} --destination "ttl.sh/${CI_COMMIT_SHA}:1h" --reproducible --use-new-run
+      - /kaniko/executor --context . --dockerfile ci/dockerfile.${CONTAINER_BASE} --destination "ttl.sh/${CI_COMMIT_SHA}.${CONTAINER_BASE}:1h" --reproducible --use-new-run
     when:
       path:
         include: [ 'ci/dockerfile.${CONTAINER_BASE}' ]
-  # test:
-  #   image: ${TOOLCHAIN%% *}
-  #   commands:
-  #     - ./utils/install_pkgs.sh && . ./.env
-  #     - cd ./bin/ && ( make test || make test --trace VERBOSE=1 )
 
 when:
   path:

diff --git a/ci/dockerfile.almalinux.8.7 b/ci/dockerfile.almalinux.8.7
@@ -9,9 +9,9 @@ RUN yum install -y gcc make &&\
 WORKDIR /numdiff
 RUN curl -s -S -L -o numdiff-${NUMDIFF_VERSION}.tar.gz https://de.freedif.org/savannah/numdiff/numdiff-${NUMDIFF_VERSION}.tar.gz && \
     echo "${NUMDIFF_SHA512SUM}  numdiff-${NUMDIFF_VERSION}.tar.gz"| sha512sum -c && \
-    tar -xvf numdiff-${NUMDIFF_VERSION}.tar.gz && cd numdiff-${NUMDIFF_VERSION}  && rm -f numdiff-${NUMDIFF_VERSION}.tar.gz &&\
-    mkdir -p bin && cd bin && \
-    CC=gcc ../configure && make
+    tar -xvf numdiff-${NUMDIFF_VERSION}.tar.gz && rm -f numdiff-${NUMDIFF_VERSION}.tar.gz
+WORKDIR /numdiff/bin
+RUN CC=gcc ../numdiff-${NUMDIFF_VERSION}/configure && make
 
 
 FROM almalinux:8.7 
@@ -26,4 +26,5 @@ RUN groupadd --gid 20001 ci_tools && useradd --uid 20001 --gid 20001 --create-ho
 
 USER ci_tool
 
-COPY --from=build_stage /numdiff /numdiff
+COPY --from=build_stage /numdiff /numdiff
+RUN numdiff --version
diff --git a/ci/dockerfile.opensuse.leap.15.4 b/ci/dockerfile.opensuse.leap.15.4
@@ -12,9 +12,9 @@ RUN zypper install -y make gcc10 gzip && \
 WORKDIR /numdiff
 RUN curl -s -S -L -o numdiff-${NUMDIFF_VERSION}.tar.gz https://de.freedif.org/savannah/numdiff/numdiff-${NUMDIFF_VERSION}.tar.gz && \
     echo "${NUMDIFF_SHA512SUM}  numdiff-${NUMDIFF_VERSION}.tar.gz"| sha512sum -c && \
-    tar -xvf numdiff-${NUMDIFF_VERSION}.tar.gz && cd numdiff-${NUMDIFF_VERSION} && rm -f numdiff-${NUMDIFF_VERSION}.tar.gz &&\
-    mkdir -p bin && cd bin && \
-    CC=gcc-10 ../configure && make
+    tar -xvf numdiff-${NUMDIFF_VERSION}.tar.gz && rm -f numdiff-${NUMDIFF_VERSION}.tar.gz
+WORKDIR /numdiff/bin
+RUN CC=gcc-10 ../numdiff-${NUMDIFF_VERSION}/configure && make
 
 
 FROM opensuse/leap:15.4
@@ -28,4 +28,5 @@ RUN groupadd --gid 20001 ci_tools && useradd --uid 20001 --gid 20001 --create-ho
 
 USER ci_tool
 
-COPY --from=build_stage /numdiff /numdiff
+COPY --from=build_stage /numdiff /numdiff
+RUN numdiff --version