Skip to content

Commit af1ede7

Browse files
pedrolamaspedrolamas
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents eca0ad2 + a6ff766 commit af1ede7

File tree

97 files changed

+2415
-1801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2415
-1801
lines changed

‎.github/workflows/build.yml‎

Lines changed: 89 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,123 @@ on:
55
branches:
66
- develop
77
- master
8+
tags:
9+
- 'v*'
810
pull_request:
911
branches:
1012
- develop
1113
- master
1214

1315
jobs:
1416
build:
15-
runs-on: ubuntu-20.04
17+
name: Build
18+
runs-on: ubuntu-latest
1619
steps:
1720
- name: Checkout
1821
uses: actions/checkout@v3
1922

20-
- name: Install node
23+
- name: Setup Node
2124
uses: actions/setup-node@v3
2225
with:
2326
node-version: 18
2427

25-
- name: Install deps
26-
run: npm ci --no-optional
28+
- name: Install dependencies
29+
run: |
30+
npm ci --no-optional
2731
2832
- name: Run lint
29-
run: npm run lint -- --no-fix
33+
run: |
34+
npm run lint -- --no-fix
3035
3136
- name: Run tests
32-
run: npm run test:unit
37+
run: |
38+
npm run test:unit
3339
34-
- name: Check for circular references
35-
run: npm run circular-check -- --no-spinner
40+
- name: Run circular references check
41+
run: |
42+
npm run circular-check -- --no-spinner
3643
3744
- name: Build
38-
run: npm run build
45+
run: |
46+
npm run build
47+
48+
- name: Upload fluidd.zip
49+
uses: actions/upload-artifact@v3
50+
with:
51+
name: fluidd-${{ github.sha }}.zip
52+
path: ./dist
53+
54+
publish-docker:
55+
name: Publish Docker Image
56+
needs: build
57+
if: ${{ github.event_name != 'pull_request' }}
58+
runs-on: ubuntu-latest
59+
steps:
60+
- name: Checkout
61+
uses: actions/checkout@v3
62+
63+
- name: Download fluidd.zip
64+
uses: actions/download-artifact@v3
65+
with:
66+
name: fluidd-${{ github.sha }}.zip
67+
path: ./dist
68+
69+
- name: Prepare Docker image metadata
70+
id: docker_meta
71+
uses: docker/metadata-action@v4
72+
with:
73+
images: |
74+
ghcr.io/${{ github.repository }}
75+
tags: |
76+
type=semver,pattern={{raw}}
77+
type=ref,event=pr
78+
type=sha,format=long
79+
type=raw,value=latest-develop,enable=${{ github.ref == 'refs/heads/develop' }}
80+
type=raw,value=latest-master,enable=${{ github.ref == 'refs/heads/master' }}
81+
82+
- name: Set up QEMU
83+
uses: docker/setup-qemu-action@v2
84+
85+
- name: Set up Docker Buildx
86+
uses: docker/setup-buildx-action@v2
87+
88+
- name: Log in to the Container registry
89+
uses: docker/login-action@v2
90+
with:
91+
registry: ghcr.io
92+
username: ${{ github.actor }}
93+
password: ${{ secrets.GITHUB_TOKEN }}
94+
95+
- name: Build and push Docker image
96+
uses: docker/build-push-action@v3
97+
with:
98+
context: .
99+
file: ./Dockerfile
100+
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
101+
push: true
102+
tags: ${{ steps.docker_meta.outputs.tags }}
103+
labels: ${{ steps.docker_meta.outputs.labels }}
104+
105+
publish-web:
106+
name: Deploy to Host
107+
needs: build
108+
if: ${{ github.ref == 'refs/heads/develop' }}
109+
runs-on: ubuntu-latest
110+
steps:
111+
- name: Checkout
112+
uses: actions/checkout@v3
113+
114+
- name: Download fluidd.zip
115+
uses: actions/download-artifact@v3
116+
with:
117+
name: fluidd-${{ github.sha }}.zip
118+
path: ./dist
39119

40120
- name: Prepare Deploy
41-
if: github.ref == 'refs/heads/develop'
42121
run: |
43122
cp ./server/config.json ./dist/config.json
44123
45124
- name: Deploy to Host
46-
if: github.ref == 'refs/heads/develop'
47125
env:
48126
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
49127
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/multiarch_dockerhub.yml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
FROM alpine:latest as unzip
2-
3-
ARG FRONTEND_ZIP_URL=https://github.com/fluidd-core/fluidd/releases/latest/download/fluidd.zip
4-
5-
WORKDIR /frontend
6-
7-
ADD ${FRONTEND_ZIP_URL} /tmp/frontend.zip
8-
RUN unzip /tmp/frontend.zip -d /frontend
9-
101
FROM nginx:alpine
112

12-
ENV JPEG_STREAM_HOST localhost
13-
ENV JPEG_STREAM_PORT 8080
3+
ENV PORT=80
144

15-
COPY --chown=101:101 server/nginx-site.conf /etc/nginx/conf.d/default.conf
16-
COPY --from=unzip --chown=101:101 /frontend /usr/share/nginx/html
17-
COPY --chown=101:101 server/config.json /usr/share/nginx/html/config.json
18-
EXPOSE 80
5+
COPY /dist /usr/share/nginx/html
6+
COPY /server/nginx /etc/nginx/templates

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Older releases can be found [here](https://github.com/fluidd-core/fluidd/release
2525

2626
## Docker
2727

28-
We have an [official docker image](https://hub.docker.com/r/cadriel/fluidd). This is updated for each release.
28+
We have an [official docker image](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd). This is updated for each release and on each commit.
2929

3030
## How to use?
3131

‎components.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ declare module 'vue' {
8686
VFooter: typeof import('vuetify/lib')['VFooter']
8787
VForm: typeof import('vuetify/lib')['VForm']
8888
VIcon: typeof import('vuetify/lib')['VIcon']
89-
VInput: typeof import('vuetify/lib')['VInput']
9089
VItemGroup: typeof import('vuetify/lib')['VItemGroup']
9190
VLayout: typeof import('vuetify/lib')['VLayout']
9291
VList: typeof import('vuetify/lib')['VList']
@@ -133,5 +132,6 @@ declare module 'vue' {
133132
VToolbarItems: typeof import('vuetify/lib')['VToolbarItems']
134133
VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']
135134
VTooltip: typeof import('vuetify/lib')['VTooltip']
135+
VVirtualScroll: typeof import('vuetify/lib')['VVirtualScroll']
136136
}
137137
}

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ printer communities and you, the user.
5050
## Docker
5151

5252
Fluidd ships with Docker support built in. The official docker can be found
53-
[here](https://hub.docker.com/r/cadriel/fluidd), and further information can be found [here](/installation/docker).
53+
[here](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd), and further information can be found [here](/installation/docker).
5454

5555
## Support
5656

‎docs/installation/docker.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ Fluidd can be hosted with Docker. This is considered an advanced install, but
1515
gives you the benefit of hosting a single instance of Fluidd, and having it
1616
connect to multiple printers.
1717

18-
The container is updated automatically with each release of Fluidd.
18+
The docker image is updated automatically with each release of Fluidd, and
19+
on each commit to the "master" or "develop" branches.
1920

20-
[View on Docker Hub](https://hub.docker.com/r/cadriel/fluidd){: .btn .fs-5 .mb-4 .mb-md-0 }
21+
This is a list of the available docker image tags:
22+
23+
- `latest`: points to the most recent release
24+
- `v*.*.*`: points to a specific release
25+
- `latest-master`: points to the most recent commit to the "master" branch
26+
- `latest-develop`: points to the most recent commit to the "develop" branch
27+
- `sha-<hash>`: points to a specific git commit hash
28+
29+
[View on GitHub Container registry](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd){: .btn .fs-5 .mb-4 .mb-md-0 }

0 commit comments

Comments
 (0)