crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ubuntu-22.04

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2022-05-17 19:09:18 +02:00
parent 991404eb79 ee08f3b8c5
commit b2c6e4b132
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@@ -55,7 +55,7 @@ jobs:
name: 'dist-${{ matrix.arch }}' name: 'dist-${{ matrix.arch }}'
path: './dist/' path: './dist/'
- name: 'Login to Docker Hub' - name: 'Login to Docker Hub'
uses: 'docker/login-action@v1' uses: 'docker/login-action@v2'
with: with:
registry: 'docker.io' registry: 'docker.io'
username: '${{ secrets.DOCKERHUB_USERNAME }}' username: '${{ secrets.DOCKERHUB_USERNAME }}'
@@ -75,7 +75,7 @@ jobs:
- name: 'Checkout project' - name: 'Checkout project'
uses: 'actions/checkout@v3' uses: 'actions/checkout@v3'
- name: 'Login to Docker Hub' - name: 'Login to Docker Hub'
uses: 'docker/login-action@v1' uses: 'docker/login-action@v2'
with: with:
registry: 'docker.io' registry: 'docker.io'
username: '${{ secrets.DOCKERHUB_USERNAME }}' username: '${{ secrets.DOCKERHUB_USERNAME }}'

2
Dockerfile.m4
View File

@@ -130,7 +130,7 @@ RUN dpkg -i ./libjpeg-turbo32_*.deb
]])m4_dnl ]])m4_dnl
# Build VirtualGL # Build VirtualGL
ARG VIRTUALGL_TREEISH=3.0 ARG VIRTUALGL_TREEISH=3.0.1
ARG VIRTUALGL_REMOTE=https://github.com/VirtualGL/virtualgl.git ARG VIRTUALGL_REMOTE=https://github.com/VirtualGL/virtualgl.git
RUN mkdir /tmp/virtualgl/ RUN mkdir /tmp/virtualgl/
WORKDIR /tmp/virtualgl/ WORKDIR /tmp/virtualgl/