Skip to content

Commit

Permalink
chore: update Dockerfile and GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
nanmu42 committed May 31, 2024
1 parent acf70b7 commit ff42eb0
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.15.1
node-version: 20.13.1

- name: Build Frontend
run: make frontend

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.x
go-version: stable

- name: Get dependencies
run: go get ./...
Expand All @@ -29,6 +29,6 @@ jobs:
run: make rly

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: latest
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build, tag, and push
env:
DOCKER_HUB_REPO: nanmu42/orly
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ RUN wget -qO /bin/pnpm "https://github.com/pnpm/pnpm/releases/latest/download/pn

WORKDIR /app
COPY . .
RUN mkdir -p assets && \
cd assets && \
wget -nc https://github.com/nanmu42/orly/releases/download/1.5.0-beta/cover-images.tar.xz && \
wget -nc https://github.com/nanmu42/orly/releases/download/1.1.0-beta/fonts.tar.xz
RUN make assets
RUN make all

FROM alpine:3.17
FROM alpine3.20
# Maintainer Info
LABEL maintainer="nanmu42<i@nanmu.me>"
# Dependencies
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ dir:
mkdir -p bin/fonts && \
mkdir -p bin/cover-images

assets:
mkdir -p assets && \
cd assets && \
wget -nc https://github.com/nanmu42/orly/releases/download/1.5.0-beta/cover-images.tar.xz && \
wget -nc https://github.com/nanmu42/orly/releases/download/1.1.0-beta/fonts.tar.xz

clean:
rm -rf bin

Expand All @@ -26,11 +32,11 @@ frontend: dir

rly: rly.bin

fonts: dir
fonts: dir assets
cd assets && \
tar -xf fonts.tar.xz --skip-old-files -C $(PWD)/bin/fonts

covers: dir
covers: dir assets
cd assets && \
tar -xf cover-images.tar.xz --skip-old-files -C $(PWD)/bin/cover-images

Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ Save as `rly.toml`, mount it into `/app/config`, and run docker image with param
O'RLY can be built in following commands:

```bash
mkdir -p assets
cd assets
wget -nc https://github.com/nanmu42/orly/releases/download/1.5.0-beta/cover-images.tar.xz
wget -nc https://github.com/nanmu42/orly/releases/download/1.1.0-beta/fonts.tar.xz
cd ..
make assets
make all
```

Expand Down
1 change: 1 addition & 0 deletions frontend/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node-options=--openssl-legacy-provider
node-linker=hoisted

0 comments on commit ff42eb0

Please sign in to comment.