Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into extract_everything_…
Browse files Browse the repository at this point in the history
…optional
  • Loading branch information
jstucke committed Nov 15, 2021
2 parents ee40662 + 9f5f5b7 commit 0605514
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Publish Docker image based on master branch

on:
push:
branches: ['master']

jobs:
build-and-publish-image:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@v2
with:
context: .
push: true
tags: fkiecad/fact_extractor:latest
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/baseimage:0.11
FROM phusion/baseimage:focal-1.1.0

WORKDIR /opt/app

Expand Down
2 changes: 1 addition & 1 deletion fact_extractor/install/unpacker.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
'python3-pyqt5',
'python3-pyqt5.qtopengl',
# patool and unpacking backends
'openjdk-11-jdk'
'openjdk-16-jdk'
]
},
# Debian
Expand Down

0 comments on commit 0605514

Please sign in to comment.