Skip to content

Commit

Permalink
Upgrade base
Browse files Browse the repository at this point in the history
Signed-off-by: Toomore Chiang <[email protected]>
  • Loading branch information
toomore committed Nov 15, 2024
1 parent eced8cb commit 00268ef
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 1,753 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ name: Go
on: push

jobs:

build:
runs-on: ubuntu-22.04

services:
mariadb:
image: mariadb:10.11.4-jammy
image: mariadb:10.11.10-jammy
ports:
- 3306:3306
env:
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM golang:1.20.5-alpine3.18
MAINTAINER Toomore Chiang <[email protected]>
FROM golang:1.22.9-alpine3.20

WORKDIR /go/src/github.com/toomore/mailbox/

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-min
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM alpine:3.18.2
MAINTAINER Toomore Chiang <[email protected]>
FROM alpine:3.20.2

WORKDIR /bin

Expand Down
4 changes: 2 additions & 2 deletions Makefile_example
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ start_mariadb:
-e CHARACTER_SET_SERVER='utf8' \
-e COLLATION_SERVER='utf8_general_ci' \
-e INIT_CONNECT='SET NAMES utf8' \
mariadb:10.1.24
mariadb:10.11.10

.PHONY: start_mariadb_client
start_mariadb_client:
-docker run -it --rm --link mailbox-mariadb-prod:MARIADB \
-v $(shell pwd)/sql:/sql \
-v $(shell pwd)/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf \
mariadb:10.1.24 bash
mariadb:10.11.10 bash

.PHONY: run_cmd
run_cmd:
Expand Down
4 changes: 2 additions & 2 deletions build-base.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
docker pull alpine:3.18.2
docker pull golang:1.20.5-alpine3.18
docker pull alpine:3.20.2
docker pull golang:1.22.9-alpine3.20
docker build -t toomore/mailbox:base ./
2 changes: 1 addition & 1 deletion dev-run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ docker run -it --rm --link mailbox-mariadb:MARIADB \
-e "mailbox_ses_sender=???" \
-e "mailbox_ses_replyto=???" \
-e "mailbox_web_site=???" \
golang:1.11.5 bash
golang:1.22.9-alpine3.20 bash
2 changes: 1 addition & 1 deletion dev-run-mariadb-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
docker run -it --rm --link mailbox-mariadb:MARIADB \
-v $(pwd)/sql:/sql \
-v $(pwd)/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf \
mariadb:10.1.24 bash
mariadb:10.11.10 bash
2 changes: 1 addition & 1 deletion dev-run-mariadb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ docker run -d --name mailbox-mariadb -v /srv/mailbox_mariadb:/var/lib/mysql \
-e CHARACTER_SET_SERVER='utf8' \
-e COLLATION_SERVER='utf8_general_ci' \
-e INIT_CONNECT='SET NAMES utf8' \
mariadb:10.1.24
mariadb:10.11.10
43 changes: 36 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,42 @@
module github.com/toomore/mailbox

go 1.16
go 1.22.0

toolchain go1.22.2

require (
github.com/aws/aws-sdk-go v1.44.285
github.com/go-sql-driver/mysql v1.7.1
github.com/aws/aws-sdk-go v1.55.5
github.com/go-sql-driver/mysql v1.8.1
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
)

require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
1,782 changes: 49 additions & 1,733 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 00268ef

Please sign in to comment.