Skip to content

Commit

Permalink
fix meta action and add spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
egillax committed Jul 9, 2024
1 parent c73ee95 commit 94276ec
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/release_docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
inputs:
docker_image:
description: 'DeepPatientLevelPrediction Docker image.'
default: 'ohdsi/deep_patient_level_prediction'
default: 'ohdsi/deep_plp'
type: string

jobs:
Expand All @@ -35,21 +35,24 @@ jobs:
# Add Docker labels and tags
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v5
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_IMAGE }}
tag-match: v(.*)
tag-match-group: 1
# Setup docker build environment
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Set build parameters
id: build_params
run: |
Expand All @@ -75,6 +78,7 @@ jobs:
org.opencontainers.image.authors=Egill A. Fridgeirsson <[email protected]>, Henrik John <[email protected]>
org.opencontainers.image.vendor=OHDSI
org.opencontainers.image.licenses=Apache-2.0
- name: Inspect image
run: |
docker pull ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM docker.io/rocker/r-ver:4.4.1 AS build

RUN --mount=type=secret,id=build_github_pat export GITHUB_PAT=$(cat /run/secrets/build_github_pat)

ARG APP_NAME

ARG GIT_BRANCH='main'
ARG GIT_COMMIT_ID_ABBREV

Expand All @@ -16,7 +14,7 @@ RUN apt-get -y update && apt-get install -y \
--no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN R cmd javareconf
RUN R CMD javareconf

RUN install2.r -n -1 \
remotes \
Expand Down Expand Up @@ -61,5 +59,5 @@ RUN apt-get -y update && apt-get install -y \
--no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& R cmd javareconf
&& R CMD javareconf

0 comments on commit 94276ec

Please sign in to comment.