mirror of https://github.com/h44z/wg-portal.git
				
				
				
			Update Go version to 1.18, prepare release
This commit is contained in:
		
							parent
							
								
									c5c6135793
								
							
						
					
					
						commit
						4b5e63c44b
					
				|  | @ -52,18 +52,18 @@ jobs: | |||
|     working_directory: ~/repo | ||||
|     docker: | ||||
|       - image: cimg/go:1.19 | ||||
|   build-116: # just to validate compatibility with minimum go version | ||||
|   build-118: # just to validate compatibility with minimum go version | ||||
|     steps: | ||||
|       - checkout | ||||
|       - restore_cache: | ||||
|           keys: | ||||
|             - go-mod-116-v4-{{ checksum "go.sum" }} | ||||
|             - go-mod-118-v4-{{ checksum "go.sum" }} | ||||
|       - run: | ||||
|           name: Install Dependencies | ||||
|           command: | | ||||
|             make build-dependencies | ||||
|       - save_cache: | ||||
|           key: go-mod-116-v4-{{ checksum "go.sum" }} | ||||
|           key: go-mod-118-v4-{{ checksum "go.sum" }} | ||||
|           paths: | ||||
|             - "~/go/pkg/mod" | ||||
|       - run: | ||||
|  | @ -72,9 +72,9 @@ jobs: | |||
|             VERSION=$CIRCLE_BRANCH | ||||
|             if [ ! -z "${CIRCLE_TAG}" ]; then VERSION=$CIRCLE_TAG; fi | ||||
|             make ENV_BUILD_IDENTIFIER=$VERSION ENV_BUILD_VERSION=$(echo $CIRCLE_SHA1 | cut -c1-7) build | ||||
|     working_directory: ~/repo116 | ||||
|     working_directory: ~/repo118 | ||||
|     docker: | ||||
|       - image: cimg/go:1.16 | ||||
|       - image: cimg/go:1.18 | ||||
| 
 | ||||
| workflows: | ||||
|   build-and-release: | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| ######- | ||||
| # Start from the latest golang base image as builder image (only used to compile the code) | ||||
| ######- | ||||
| FROM golang:1.16 as builder | ||||
| FROM golang:1.18 as builder | ||||
| 
 | ||||
| ARG BUILD_IDENTIFIER | ||||
| ENV ENV_BUILD_IDENTIFIER=$BUILD_IDENTIFIER | ||||
|  |  | |||
|  | @ -10,7 +10,7 @@ If you want to build the binary yourself, use the following building instruction | |||
| ### Building | ||||
| This section describes how to build the WireGuard Portal code. | ||||
| To compile the final binary, use the Makefile provided in the repository. | ||||
| As WireGuard Portal is written in Go, **golang >= 1.16** must be installed prior to building. | ||||
| As WireGuard Portal is written in Go, **golang >= 1.18** must be installed prior to building. | ||||
| If you want to cross compile ARM binaries from AMD64 systems, install *arm-linux-gnueabi-gcc* (armv7) or *aarch64-linux-gnu-gcc* (arm64). | ||||
| 
 | ||||
| ``` | ||||
|  |  | |||
|  | @ -88,7 +88,7 @@ If needed, please make sure to back up your files from ```/etc/wireguard```. | |||
| For a full list of configuration options take a look at the source file [internal/server/configuration.go](internal/server/configuration.go#L58). | ||||
| 
 | ||||
| ### Standalone | ||||
| For a standalone application, use the Makefile provided in the repository to build the application. Go version 1.16 or higher has to be installed to build WireGuard Portal. | ||||
| For a standalone application, use the Makefile provided in the repository to build the application. Go version 1.18 or higher has to be installed to build WireGuard Portal. | ||||
| 
 | ||||
| ```shell | ||||
| # show all possible make commands | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| version: '3.6' | ||||
| services: | ||||
|   wg-portal: | ||||
|     image: h44z/wg-portal:1.0.16 | ||||
|     image: h44z/wg-portal:1.0.17 | ||||
|     container_name: wg-portal | ||||
|     restart: unless-stopped | ||||
|     logging: | ||||
|  |  | |||
							
								
								
									
										63
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										63
									
								
								go.mod
								
								
								
								
							|  | @ -1,24 +1,15 @@ | |||
| module github.com/h44z/wg-portal | ||||
| 
 | ||||
| go 1.16 | ||||
| go 1.18 | ||||
| 
 | ||||
| require ( | ||||
| 	git.prolicht.digital/golib/healthcheck v1.1.1 | ||||
| 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect | ||||
| 	github.com/dchest/uniuri v1.2.0 // indirect | ||||
| 	github.com/evanphx/json-patch v5.6.0+incompatible | ||||
| 	github.com/gin-contrib/sessions v0.0.5 | ||||
| 	github.com/gin-gonic/gin v1.8.2 | ||||
| 	github.com/go-ldap/ldap/v3 v3.4.4 | ||||
| 	github.com/go-openapi/jsonreference v0.20.2 // indirect | ||||
| 	github.com/go-openapi/spec v0.20.8 // indirect | ||||
| 	github.com/go-playground/validator/v10 v10.11.2 | ||||
| 	github.com/go-test/deep v1.0.8 // indirect | ||||
| 	github.com/goccy/go-json v0.10.0 // indirect | ||||
| 	github.com/josharian/native v1.1.0 // indirect | ||||
| 	github.com/kelseyhightower/envconfig v1.4.0 | ||||
| 	github.com/mattn/go-isatty v0.0.17 // indirect | ||||
| 	github.com/mdlayher/genetlink v1.3.1 // indirect | ||||
| 	github.com/milosgajdos/tenus v0.0.3 | ||||
| 	github.com/pkg/errors v0.9.1 | ||||
| 	github.com/sirupsen/logrus v1.9.0 | ||||
|  | @ -28,16 +19,60 @@ require ( | |||
| 	github.com/swaggo/swag v1.8.10 | ||||
| 	github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e | ||||
| 	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f | ||||
| 	github.com/ugorji/go/codec v1.2.9 // indirect | ||||
| 	github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca | ||||
| 	github.com/xhit/go-simple-mail/v2 v2.13.0 | ||||
| 	golang.org/x/crypto v0.6.0 | ||||
| 	golang.org/x/net v0.7.0 // indirect | ||||
| 	golang.org/x/tools v0.6.0 // indirect | ||||
| 	golang.zx2c4.com/wireguard v0.0.0-20230216153314-c7b76d3d9ecd // indirect | ||||
| 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde | ||||
| 	gopkg.in/yaml.v3 v3.0.1 | ||||
| 	gorm.io/driver/mysql v1.4.7 | ||||
| 	gorm.io/driver/sqlite v1.4.4 | ||||
| 	gorm.io/gorm v1.24.5 | ||||
| ) | ||||
| 
 | ||||
| require ( | ||||
| 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect | ||||
| 	github.com/KyleBanks/depth v1.2.1 // indirect | ||||
| 	github.com/dchest/uniuri v1.2.0 // indirect | ||||
| 	github.com/docker/libcontainer v2.2.1+incompatible // indirect | ||||
| 	github.com/gin-contrib/sse v0.1.0 // indirect | ||||
| 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect | ||||
| 	github.com/go-openapi/jsonpointer v0.19.6 // indirect | ||||
| 	github.com/go-openapi/jsonreference v0.20.2 // indirect | ||||
| 	github.com/go-openapi/spec v0.20.8 // indirect | ||||
| 	github.com/go-openapi/swag v0.22.3 // indirect | ||||
| 	github.com/go-playground/locales v0.14.1 // indirect | ||||
| 	github.com/go-playground/universal-translator v0.18.1 // indirect | ||||
| 	github.com/go-sql-driver/mysql v1.7.0 // indirect | ||||
| 	github.com/go-test/deep v1.0.8 // indirect | ||||
| 	github.com/goccy/go-json v0.10.0 // indirect | ||||
| 	github.com/google/go-cmp v0.5.9 // indirect | ||||
| 	github.com/gorilla/context v1.1.1 // indirect | ||||
| 	github.com/gorilla/securecookie v1.1.1 // indirect | ||||
| 	github.com/gorilla/sessions v1.2.1 // indirect | ||||
| 	github.com/jinzhu/inflection v1.0.0 // indirect | ||||
| 	github.com/jinzhu/now v1.1.5 // indirect | ||||
| 	github.com/josharian/intern v1.0.0 // indirect | ||||
| 	github.com/josharian/native v1.1.0 // indirect | ||||
| 	github.com/json-iterator/go v1.1.12 // indirect | ||||
| 	github.com/leodido/go-urn v1.2.1 // indirect | ||||
| 	github.com/mailru/easyjson v0.7.7 // indirect | ||||
| 	github.com/mattn/go-isatty v0.0.17 // indirect | ||||
| 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect | ||||
| 	github.com/mdlayher/genetlink v1.3.1 // indirect | ||||
| 	github.com/mdlayher/netlink v1.7.1 // indirect | ||||
| 	github.com/mdlayher/socket v0.4.0 // indirect | ||||
| 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||||
| 	github.com/modern-go/reflect2 v1.0.2 // indirect | ||||
| 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect | ||||
| 	github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect | ||||
| 	github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect | ||||
| 	github.com/ugorji/go/codec v1.2.9 // indirect | ||||
| 	golang.org/x/net v0.7.0 // indirect | ||||
| 	golang.org/x/sync v0.1.0 // indirect | ||||
| 	golang.org/x/sys v0.5.0 // indirect | ||||
| 	golang.org/x/text v0.7.0 // indirect | ||||
| 	golang.org/x/tools v0.6.0 // indirect | ||||
| 	golang.zx2c4.com/wireguard v0.0.0-20230216153314-c7b76d3d9ecd // indirect | ||||
| 	google.golang.org/protobuf v1.28.1 // indirect | ||||
| 	gopkg.in/yaml.v2 v2.4.0 // indirect | ||||
| ) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue