Skip to content

Commit

Permalink
Fix publish tag change
Browse files Browse the repository at this point in the history
  • Loading branch information
unkcpz committed May 8, 2024
1 parent 32c6dbb commit 3cc7b4c
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 65 deletions.
48 changes: 20 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,7 @@ jobs:
publish:
runs-on: ubuntu-latest
timeout-minutes: 30
needs: [build, test]
strategy:
matrix:
registry: ["docker.io", "ghcr.io"]
needs: [build]
if: >-
github.repository == 'pspgen/build-machine'
&& (github.ref_type == 'tag' || github.ref_name == 'main')
Expand All @@ -134,14 +131,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to DockerHub 🔑
uses: docker/login-action@v3
if: inputs.registry == 'docker.io'
with:
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Read build variables
id: build_vars
run: |
Expand All @@ -153,7 +142,7 @@ jobs:
uses: docker/metadata-action@v5
env: ${{ fromJSON(steps.build_vars.outputs.vars) }}
with:
images: ${{ matrix.registry }}/${{ github.repository_owner }}/build-machine
images: ghcr.io/${{ github.repository_owner }}/build-machine
tags: |
type=edge,enable={{is_default_branch}}
type=raw,value={{tag}},enable=${{ github.ref_type == 'tag' && ! startsWith(github.ref_name, 'v') }}
Expand All @@ -162,23 +151,26 @@ jobs:
type=raw,value=lapack-${{ env.LAPACK_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
type=match,pattern=v(\d{4}\.\d{4}(-.+)?),group=1
- name: Determine source image
id: images
- name: Parse digest name
id: parse_digest
run: |
echo '${{ needs.build.outputs.image }}' | jq -r 'split("@") | {repository: .[0], digest: (.[1] | split(":")[1])}' > /tmp/parse_digest.json
echo "repository=$(cat /tmp/parse_digest.json | jq -r '.repository')" | tee -a "${GITHUB_OUTPUT}"
echo "digest=$(cat /tmp/parse_digest.json | jq -r '.digest')" | tee -a "${GITHUB_OUTPUT}"
- name: Pull, tag and push
id: retag
run: |
src=$(echo '${{ inputs.images }}'| jq -cr '.[("${{ matrix.target }}"|ascii_upcase|sub("-"; "_"; "g")) + "_IMAGE"]')
echo "src=$src" | tee -a "${GITHUB_OUTPUT}"
temp_tag=${{ steps.parse_digest.outputs.repository}}:${{ steps.parse_digest.outputs.digest }}
- name: Push image
docker pull ${{ needs.build.outputs.image }}
docker tag ${{ needs.build.outputs.image }} ${temp_tag}
docker push ${temp_tag}
echo "temp_tag=${temp_tag}" | tee -a "${GITHUB_OUTPUT}"
- name: Push tags
uses: akhilerm/[email protected]
with:
src: ${{ needs.build.outputs.image }}
src: ${{ steps.retag.outputs.temp_tag }}
dst: ${{ steps.meta.outputs.tags }}

- name: Docker Hub Description
if: inputs.registry == 'docker.io'
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: pspgen/build-machine
short-description: ${{ github.event.repository.description }}
74 changes: 37 additions & 37 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@
FROM base-image

# Tool chain for building
RUN apt-get update && apt-get install -y \
build-essential \
automake \
autoconf \
libtool \
wget \
gfortran-7 && \
apt-get clean && rm -rf /var/lib/apt/lists/*

ARG GNU_COMPILER_VERSION

RUN update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GNU_COMPILER_VERSION} 2 && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GNU_COMPILER_VERSION} 2

WORKDIR /build

ARG LAPACK_VERSION

RUN wget -c -O lapack.tar.gz https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACK_VERSION}.tar.gz && \
mkdir -p lapack && \
tar xf lapack.tar.gz -C lapack --strip-components=1 && \
cd lapack && \
cp INSTALL/make.inc.gfortran make.inc && \
make lapacklib blaslib && \
mkdir -p /usr/local/lapack/lib && \
cp *.a /usr/local/lapack/lib

ARG LIBXC_VERSION
RUN wget -c -O libxc.tar.gz https://gitlab.com/libxc/libxc/-/archive/4.3.4/libxc-4.3.4.tar.gz && \
mkdir -p libxc && \
tar xf libxc.tar.gz -C libxc --strip-components=1 && \
cd libxc && \
autoreconf -i && \
./configure --prefix=/usr/local/libxc && \
make && make install

RUN rm -rf /build
#RUN apt-get update && apt-get install -y \
# build-essential \
# automake \
# autoconf \
# libtool \
# wget \
# gfortran-7 && \
# apt-get clean && rm -rf /var/lib/apt/lists/*
#
#ARG GNU_COMPILER_VERSION
#
#RUN update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GNU_COMPILER_VERSION} 2 && \
# update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GNU_COMPILER_VERSION} 2
#
#WORKDIR /build
#
#ARG LAPACK_VERSION
#
#RUN wget -c -O lapack.tar.gz https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACK_VERSION}.tar.gz && \
# mkdir -p lapack && \
# tar xf lapack.tar.gz -C lapack --strip-components=1 && \
# cd lapack && \
# cp INSTALL/make.inc.gfortran make.inc && \
# make lapacklib blaslib && \
# mkdir -p /usr/local/lapack/lib && \
# cp *.a /usr/local/lapack/lib
#
#ARG LIBXC_VERSION
#RUN wget -c -O libxc.tar.gz https://gitlab.com/libxc/libxc/-/archive/4.3.4/libxc-4.3.4.tar.gz && \
# mkdir -p libxc && \
# tar xf libxc.tar.gz -C libxc --strip-components=1 && \
# cd libxc && \
# autoreconf -i && \
# ./configure --prefix=/usr/local/libxc && \
# make && make install
#
#RUN rm -rf /build
WORKDIR /

0 comments on commit 3cc7b4c

Please sign in to comment.