Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New base image and ci #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: PR

on:
pull_request:
branches: [ "main", "master" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
initialise:
runs-on: ubuntu-latest

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

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

build_only:
needs: initialise
runs-on: ubuntu-latest

steps:
- name: Build docker image
uses: docker/build-push-action@v4
with:
push: false
tags: user/app:latest
34 changes: 34 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: release-CI

on:
release:
types: [published]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build_and_publish:
runs-on: ubuntu-latest

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

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

- name: Login to Quay IO
uses: docker/login-action@v2
with:
registry: quay.io
username: '$oauthtoken'
password: ${{ secrets.QUAY_OAUTH_TOKEN }}

- name: Build docker image and push to quay.io
uses: docker/build-push-action@v4
with:
push: true
tags: quay.io/galaxy/docker-jupyter-notebook:${{ github.event.release.tag_name }}


4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM jlesage/baseimage-gui:ubuntu-18.04 AS build
FROM jlesage/baseimage-gui:ubuntu-22.04-v4 AS build

MAINTAINER Anne Fouilloux, [email protected].no
MAINTAINER Anne Fouilloux, annef@simula.no

# Get packages including Java
RUN apt-get update -y && \
Expand Down