Compare commits

..

9 Commits

Author SHA1 Message Date
f293f7c34f fix(deps): update module github.com/gofiber/template/html/v2 to v2.1.3 2025-01-28 06:00:38 +00:00
ngn
02d8997f25 Merge pull request 'chore(deps): update golang docker tag to v1.23.5' (#2) from renovate/golang-1.x into main
All checks were successful
Build docker image / build (push) Successful in 47s
Reviewed-on: #2
2025-01-28 08:46:41 +03:00
ngn
58d70937ca Merge branch 'main' into renovate/golang-1.x 2025-01-28 08:46:34 +03:00
ngn
80897bfa9e
fix: dockerfile entrypoint
All checks were successful
Build docker image / build (push) Successful in 7s
Signed-off-by: ngn <ngn@ngn.tf>
2025-01-28 08:19:48 +03:00
ngn
391382d921 Merge pull request 'fix(deps): update module github.com/gofiber/fiber/v2 to v2.52.6' (#3) from renovate/github.com-gofiber-fiber-v2-2.x into main
All checks were successful
Build docker image / build (push) Successful in 1m16s
Reviewed-on: #3
2025-01-28 08:17:00 +03:00
ngn
2b4ca31dc0 Merge branch 'main' into renovate/github.com-gofiber-fiber-v2-2.x 2025-01-28 08:16:33 +03:00
ngn
52e1a3ec8a
new: docker image workflow
All checks were successful
Build docker image / build (push) Successful in 52s
Signed-off-by: ngn <ngn@ngn.tf>
2025-01-28 08:13:58 +03:00
7a2c72e336 fix(deps): update module github.com/gofiber/fiber/v2 to v2.52.6 2025-01-28 04:12:30 +00:00
c35fca8b3a chore(deps): update golang docker tag to v1.23.5 2025-01-28 04:12:28 +00:00
5 changed files with 59 additions and 21 deletions

View File

@ -0,0 +1,28 @@
name: Build docker image
on:
push:
branches: ["main"]
env:
REGISTRY: git.matterlinux.xyz
IMAGE: ${{gitea.repository}}
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: "https://github.com/actions/checkout@v4"
- name: Login to container repo
uses: "https://github.com/docker/login-action@v1"
with:
registry: ${{env.REGISTRY}}
username: ${{gitea.actor}}
password: ${{secrets.PACKAGES_TOKEN}}
- name: Build image
run: |
docker build --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest .
docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest

View File

@ -1,17 +1,24 @@
FROM golang:1.23.2 FROM golang:1.23.5
WORKDIR /app WORKDIR /app
COPY *.go ./ RUN useradd runner -r -u 1001 -d /app
COPY *.mod ./ RUN chown -R runner:runner /app
COPY *.sum ./ USER runner
COPY log ./log COPY *.mod ./
COPY *.sum ./
RUN go mod download
COPY *.go ./
COPY Makefile ./
COPY lib ./lib COPY lib ./lib
COPY routes ./routes COPY log ./log
COPY public ./public COPY public ./public
COPY routes ./routes
COPY templates ./templates COPY templates ./templates
RUN go build . RUN make
ENTRYPOINT ["/app/website"] ENTRYPOINT ["/app/website"]

View File

@ -1,25 +1,24 @@
# website | MatterLinux website # website | MatterLinux website
![](https://git.matterlinux.xyz/matter/website/actions/workflows/docker.yml/badge.svg)
Soruce code of Matterlinux's offical website, which is Soruce code of Matterlinux's offical website, which is
located at [matterlinux.xyz](https://matterlinux.xyz) located at [matterlinux.xyz](https://matterlinux.xyz)
### Deployment ### Deployment
Web server can be built and deployed with docker compose using the following Web server can be deployed with docker compose using the following configuration file:
configuration file:
```yaml ```yaml
version: "3"
services: services:
website: website:
image: matterwebsite container_name: matterwebsite
restart: unless-stopped image: git.matterlinux.xyz/matter/website
build:
context: ./
ports: ports:
- "127.0.0.1:9878:9878" - "127.0.0.1:9878:9878"
volumes: volumes:
- "./content:/app/content" - "./content:/app/content"
restart: unless-stopped
``` ```
After saving the configuration file, you can build and run the docker container: After saving the configuration file, you can run the docker container:
```bash ```bash
docker-compose up -d docker-compose up -d
``` ```

4
go.mod
View File

@ -4,7 +4,7 @@ go 1.22.5
require ( require (
github.com/bigkevmcd/go-configparser v0.0.0-20240808124832-fc81059ea0bd github.com/bigkevmcd/go-configparser v0.0.0-20240808124832-fc81059ea0bd
github.com/gofiber/fiber/v2 v2.52.5 github.com/gofiber/fiber/v2 v2.52.6
github.com/gofiber/template/html/v2 v2.1.3 github.com/gofiber/template/html/v2 v2.1.3
github.com/gorilla/feeds v1.2.0 github.com/gorilla/feeds v1.2.0
github.com/russross/blackfriday/v2 v2.1.0 github.com/russross/blackfriday/v2 v2.1.0
@ -23,5 +23,5 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.57.0 // indirect github.com/valyala/fasthttp v1.57.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect
golang.org/x/sys v0.27.0 // indirect golang.org/x/sys v0.28.0 // indirect
) )

4
go.sum
View File

@ -6,6 +6,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo= github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo=
github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27XVI=
github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
github.com/gofiber/template v1.8.3 h1:hzHdvMwMo/T2kouz2pPCA0zGiLCeMnoGsQZBTSYgZxc= github.com/gofiber/template v1.8.3 h1:hzHdvMwMo/T2kouz2pPCA0zGiLCeMnoGsQZBTSYgZxc=
github.com/gofiber/template v1.8.3/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8= github.com/gofiber/template v1.8.3/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8=
github.com/gofiber/template/html/v2 v2.1.2 h1:wkK/mYJ3nIhongTkG3t0QgV4ADdgOYJYVSAF2AHnh8Y= github.com/gofiber/template/html/v2 v2.1.2 h1:wkK/mYJ3nIhongTkG3t0QgV4ADdgOYJYVSAF2AHnh8Y=
@ -54,6 +56,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=