switch to official mainsail docker image

* update docs
* update image in compose file
* remove mainsail dockerfile
* remove mainsail image workflow
This commit is contained in:
Markus Küffner
2022-07-08 09:44:13 +02:00
committed by Markus Küffner
parent abbb8f55fe
commit c472abbd5b
5 changed files with 2 additions and 84 deletions

View File

@@ -1,13 +0,0 @@
name: 'Image: Mainsail'
on:
workflow_dispatch:
schedule:
- cron: '0 2 * * *'
jobs:
build:
uses: mkuf/prind/.github/workflows/image-workflow.yaml@main
with:
app: mainsail
secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

View File

@@ -3,7 +3,6 @@
# prind # prind
[![Image: Klipper](https://github.com/mkuf/prind/actions/workflows/klipper.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/klipper.yaml) [![Image: Klipper](https://github.com/mkuf/prind/actions/workflows/klipper.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/klipper.yaml)
[![Image: Moonraker](https://github.com/mkuf/prind/actions/workflows/moonraker.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/moonraker.yaml) [![Image: Moonraker](https://github.com/mkuf/prind/actions/workflows/moonraker.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/moonraker.yaml)
[![Image: Mainsail](https://github.com/mkuf/prind/actions/workflows/mainsail.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/mainsail.yaml)
[![Image: Klipperscreen](https://github.com/mkuf/prind/actions/workflows/klipperscreen.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/klipperscreen.yaml) [![Image: Klipperscreen](https://github.com/mkuf/prind/actions/workflows/klipperscreen.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/klipperscreen.yaml)
[![Image: Ustreamer](https://github.com/mkuf/prind/actions/workflows/ustreamer.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/ustreamer.yaml) [![Image: Ustreamer](https://github.com/mkuf/prind/actions/workflows/ustreamer.yaml/badge.svg)](https://github.com/mkuf/prind/actions/workflows/ustreamer.yaml)
@@ -13,7 +12,7 @@ With a single Command, you can start up klipper and choose between multiple Fron
Currently supported Frontends: Currently supported Frontends:
* Octoprint (via [Dockerhub](https://hub.docker.com/r/octoprint/octoprint)) * Octoprint (via [Dockerhub](https://hub.docker.com/r/octoprint/octoprint))
* Fluidd (via [Dockerhub](https://hub.docker.com/r/cadriel/fluidd)) * Fluidd (via [Dockerhub](https://hub.docker.com/r/cadriel/fluidd))
* Mainsail * Mainsail (via [GHCR](https://github.com/mainsail-crew/mainsail/pkgs/container/mainsail))
* KlipperScreen * KlipperScreen
Depending on which Frontend you've chosen, moonraker will also be deployed. Depending on which Frontend you've chosen, moonraker will also be deployed.
@@ -64,7 +63,6 @@ In this example, the Webcam is using device ``/dev/video0``. Do not edit any oth
- "traefik.http.routers.webcam.middlewares=webcam" - "traefik.http.routers.webcam.middlewares=webcam"
``` ```
### Configuring Klipper/Moonraker ### Configuring Klipper/Moonraker
All Runtime Configs are stored within ``config`` of this Repo. All Runtime Configs are stored within ``config`` of this Repo.
* Update config/printer.cfg with your Klipper config, make sure to not remove the existing Macros as they are required by fluidd/mainsail. See [Klipper3d Docs](https://www.klipper3d.org/Config_Reference.html) for Reference * Update config/printer.cfg with your Klipper config, make sure to not remove the existing Macros as they are required by fluidd/mainsail. See [Klipper3d Docs](https://www.klipper3d.org/Config_Reference.html) for Reference

View File

@@ -106,7 +106,7 @@ services:
- "traefik.http.routers.fluidd.entrypoints=web" - "traefik.http.routers.fluidd.entrypoints=web"
mainsail: mainsail:
image: mkuf/mainsail:latest image: ghcr.io/mainsail-crew/mainsail:edge
restart: unless-stopped restart: unless-stopped
profiles: profiles:
- mainsail - mainsail

View File

@@ -1,19 +0,0 @@
## Get Code and build App
FROM --platform=$BUILDPLATFORM node:16 as build
ARG REPO=https://github.com/mainsail-crew/mainsail
ARG VERSION=develop
RUN git clone ${REPO} /opt/mainsail \
&& cd /opt/mainsail \
&& git checkout ${VERSION}
WORKDIR /opt/mainsail
RUN npm install \
&& ./node_modules/vite/bin/vite.js build
## Runtime Image
FROM nginx:alpine as run
COPY --from=build /opt/mainsail/dist /usr/share/nginx/html
RUN chown -R nginx:nginx /usr/share/nginx/html

View File

@@ -1,48 +0,0 @@
# Mainsail packaged in Docker
## What is Mainsail?
>Mainsail makes Klipper more accessible by adding a lightweight, responsive web user interface, centred around an intuitive and consistent design philosophy.
_via https://docs.mainsail.xyz/_
## Usage
#### Run
```bash
docker run -p 80:80 mkuf/mainsail:latest
```
#### Compose
```yaml
services:
mainsail:
image: mkuf/mainsail:latest
ports:
- "80:80"
```
## Defaults
|Entity|Description|
|---|---|
|User| `nginx (101:101)` |
|Workdir||
|Entrypoint|`/docker-entrypoint.sh`|
|Cmd|`nginx -g daemon off;`|
## Ports
|Port|Description|
|---|---|
|`80/tcp`|Default HTTP Port|
## Volumes
none
## Tags
|Tag|Description|Static|
|---|---|---|
|`latest`/`nightly`|Refers to the most recent runtime Image.|May point to a new build within 24h, depending on code changes in the upstream repository.|
|`<7-digit-sha>` <br>eg: `1e0645b`|Refers to a specific commit SHA in the upstream repository. eg: [mainsail-crew/mainsail:1e0645b](https://github.com/mainsail-crew/mainsail/commit/1e0645be6e54abed1e30d54830511ae8f1fad54c)|Yes|
## Targets
|Target|Description|Pushed|
|---|---|---|
|`build`|Pull Upstream Codebase and build application|No|
|`run`|Default runtime Image based on `library/nginx`|Yes|