Bump build dependencies to bookworm, golang 1.20, postgres 15 (closes #274)
This commit is contained in:
parent
da3d454038
commit
8154b642e7
2
.github/workflows/pr.yml
vendored
2
.github/workflows/pr.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
- name: Set up Go 1.x
|
||||
uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: 1.18
|
||||
go-version: '1.20'
|
||||
|
||||
- name: Check out code into the Go module directory
|
||||
uses: actions/checkout@v2
|
||||
|
@ -1,8 +1,8 @@
|
||||
FROM golang:1.18-buster as builder
|
||||
FROM golang:1.20-bookworm as builder
|
||||
LABEL io.hockeypuck.temp=true
|
||||
RUN adduser builder --system --disabled-login
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update -qq && apt-get -y install build-essential postgresql-11 postgresql-server-dev-11 --no-install-recommends
|
||||
RUN apt-get update -qq && apt-get -y install build-essential postgresql-15 postgresql-server-dev-15 --no-install-recommends
|
||||
COPY --chown=builder:root Makefile /hockeypuck/
|
||||
COPY --chown=builder:root src /hockeypuck/src
|
||||
ENV GOPATH=/hockeypuck
|
||||
@ -13,7 +13,7 @@ COPY --chown=builder:root .git /hockeypuck/.git
|
||||
RUN make build
|
||||
|
||||
|
||||
FROM debian:buster-slim
|
||||
FROM debian:bookworm-slim
|
||||
RUN mkdir -p /hockeypuck/bin /hockeypuck/lib /hockeypuck/etc /hockeypuck/data
|
||||
COPY --from=builder /hockeypuck/bin /hockeypuck/bin
|
||||
COPY contrib/templates /hockeypuck/lib/templates
|
||||
|
@ -10,7 +10,7 @@ NB: all the below assume that you have `cd`-ed into this directory first.
|
||||
|
||||
# Supported platforms
|
||||
|
||||
Tested on Ubuntu 20.04 and Debian 11 (bullseye), with dependencies installed using `./setup.bash`.
|
||||
Tested on Ubuntu 22.04 and Debian 11 (bullseye), with dependencies installed using `./setup.bash`.
|
||||
|
||||
Other platforms may work but will require some customization.
|
||||
At minimum, docker (v18.06+) and docker-compose (v1.22+) must be installed in advance.
|
||||
|
@ -27,7 +27,7 @@ services:
|
||||
max-file: "3"
|
||||
|
||||
postgres:
|
||||
image: postgres:11
|
||||
image: postgres:${POSTGRES_VERSION:-11}
|
||||
restart: always
|
||||
environment:
|
||||
- POSTGRES_USER
|
||||
|
@ -41,6 +41,17 @@ FINGERPRINT=0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF
|
||||
# ACME Directory Resource URI (use Let's Encrypt if empty)
|
||||
ACME_SERVER=
|
||||
|
||||
# Version of PostgreSQL to initialise
|
||||
# BEWARE if you change this, you MUST do one of the following:
|
||||
#
|
||||
# a) remove the "standalone_pg_data" docker volume and restore from dump:
|
||||
# docker volume rm standalone_pg_data
|
||||
#
|
||||
# b) migrate the postgres data files by hand, see e.g.:
|
||||
# https://github.com/tianon/docker-postgres-upgrade
|
||||
#
|
||||
POSTGRES_VERSION=15
|
||||
|
||||
###########################################################
|
||||
# You normally won't need to change anything below here
|
||||
###########################################################
|
||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -2,7 +2,7 @@ Source: hockeypuck
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Casey Marshall <cmars@cmarstech.com>
|
||||
Build-Depends: debhelper (>= 9), golang-1.12, dh-systemd (>= 1.5)
|
||||
Build-Depends: debhelper (>= 9), golang-1.20
|
||||
Standards-Version: 3.9.5
|
||||
Homepage: https://hockeypuck.github.io/
|
||||
|
||||
|
@ -43,7 +43,7 @@ parts:
|
||||
# https://github.com/golang/go/issues/33840
|
||||
- CGO_ENABLED: "0"
|
||||
build-snaps:
|
||||
- go/1.18/stable
|
||||
- go/1.20/stable
|
||||
plugin: make
|
||||
make-parameters:
|
||||
- prefix=
|
||||
|
@ -1,6 +1,6 @@
|
||||
module hockeypuck
|
||||
|
||||
go 1.18
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v1.3.2
|
||||
|
Loading…
x
Reference in New Issue
Block a user