move Dockerfile an compose to base folder for later support of different packaging

This commit is contained in:
2022-02-22 10:33:30 +01:00
parent 1ca29cc06e
commit 1191a7a5e6
4 changed files with 8 additions and 5 deletions

View File

@@ -57,7 +57,7 @@ jobs:
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with: with:
context: . context: base
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

View File

@@ -6,8 +6,11 @@ This repository contains the build instructions for a rust libadwaita gtk app. A
To build the image go to the main repository and run: To build the image go to the main repository and run:
### BaseImage
``` ```
docker build gtk4-rs-docker -t gtk4-rs-docker docker build base -t gtk4-rs-docker
``` ```
## Compiling the example application ## Compiling the example application
@@ -21,10 +24,10 @@ docker-compose up
## Using for your own application ## Using for your own application
To use this image for your own application simply copy the docker-compose file to your application directory and modify the path of the volume mount to your project directory: To use this image for your own application simply copy the docker-compose file to your application directory and modify the path of the volume mount to your project directory:
You need to modify `./adwaita-demo` to that path in in the compose file): You need to modify `../adwaita-demo` to that path in in the compose file):
``` ```
volumes: volumes:
- ./adwaita-demo:/mnt:z - ../adwaita-demo:/mnt:z
``` ```
## Contributing ## Contributing

View File

@@ -3,6 +3,6 @@ services:
rust-gtk: rust-gtk:
image: ghcr.io/13hannes11/gtk4-rs-docker:latest image: ghcr.io/13hannes11/gtk4-rs-docker:latest
volumes: volumes:
- ./adwaita-demo:/mnt:z - ../adwaita-demo:/mnt:z
command: /bin/bash -c "cargo build --release" command: /bin/bash -c "cargo build --release"