Skip to content

Commit

Permalink
Merge pull request #33 from dbehnke/dbehnke/libraryupdates
Browse files Browse the repository at this point in the history
feat: update to Go 1.21.3 and Quasar v2.12.7
  • Loading branch information
dbehnke authored Oct 20, 2023
2 parents dc0d042 + 14772ee commit d3c5126
Show file tree
Hide file tree
Showing 32 changed files with 801 additions and 725 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ on:
jobs:

audit:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.21

- name: Verify dependencies
run: go mod verify
Expand All @@ -32,9 +32,3 @@ jobs:

- name: Run staticcheck
run: staticcheck ./...

- name: Install golint
run: go install golang.org/x/lint/golint@latest

- name: Run golint
run: golint ./...
56 changes: 56 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: golangci-lint
on:
push:
branches:
- master
- main
pull_request:

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.21'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
#version: v1.54
version: latest

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
#
# Note: By default, the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
# args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true, then all caching functionality will be completely disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true, then the action won't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"
18 changes: 10 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
FROM golang:alpine as builder
RUN apk add make git
FROM golang:bookworm as builder
RUN apt-get install -y make git
COPY ./ /usr/src/app/
WORKDIR /usr/src/app
RUN make clean && make

FROM alpine:latest
FROM debian:bookworm-slim
ARG uid=1000
ARG gid=1000
RUN apk add file
RUN adduser -u ${uid} -g ${gid} -h /app -D gouser
USER gouser
WORKDIR /app
ARG user=gouser
ARG userhome=/app
RUN groupadd -f -g ${gid} ${user}
RUN useradd -l -u ${uid} -g ${gid} -d "${userhome}" -r ${user}
USER ${user}
WORKDIR ${userhome}
COPY --from=builder /usr/src/app/gomrefdash .
COPY --from=builder /usr/src/app/frontend/spa/ frontend/spa/
EXPOSE 3000
ENTRYPOINT ./gomrefdash
ENTRYPOINT ./gomrefdash
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ reverse proxy.
These are some things that aren't officially supported, but you can try it out.
### Docker
You may wish to to use https://github.com/mfiscus/mrefd-docker which contains both mrefd and the dashboard.
Below are legacy instructions to use the docker solution in this repository.
#### Some Assumptions
1. mrefd is already running on the system running docker.
Expand Down Expand Up @@ -197,7 +201,7 @@ The makefile has various convience functions:
## Roadmap

- [x] Beta Release
- [x] Refresh page on log file changes, instead of a meta refresh in browser - thanks AC8ZD
- [x] Refresh page on log file changes, instead of a meta refresh in browser - thanks KF8S
- [x] Create two-column layout for Modules In Use, instead of a single column
- [x] Add country flags for callsigns

Expand Down Expand Up @@ -237,7 +241,7 @@ Project Link: [https://github.com/kc1awv/gomrefdash](https://github.com/kc1awv/g
## Acknowledgments
* [Tom N7TAE](https://github.com/n7tae) _Creator of mrefd and inspiration for development_
* [Dave AC8ZD](https://github.com/dbehnke) _Beta testing and great feedback, page refresh code, many improvements_
* [Dave KF8S](https://github.com/dbehnke) _Beta testing and great feedback, page refresh code, many improvements_
* edgetriggered _Teaching me finer points of Golang, help and guidance_
<p align="right">(<a href="#readme-top">back to top</a>)</p>
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.4
0.5.0
Loading

0 comments on commit d3c5126

Please sign in to comment.