From 147ff33d4a2533e6102b56282cade96b56a3508b Mon Sep 17 00:00:00 2001 From: mom0tomo Date: Tue, 17 Jan 2023 14:39:59 +0900 Subject: [PATCH 1/2] update Go version to 1.9 --- go.mod | 13 ++++++++++--- go.sum | 22 +++++----------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index f154a6f..fb475f7 100644 --- a/go.mod +++ b/go.mod @@ -4,16 +4,23 @@ require ( github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 github.com/aws/aws-sdk-go v1.31.7 github.com/chai2010/webp v1.1.0 - github.com/go-ini/ini v1.26.0 // indirect github.com/ieee0824/libcmyk v0.0.0-20171222081915-8cf9151a408c github.com/ieee0824/logrus-formatter v1.0.0 github.com/mitchellh/go-server-timing v1.0.0 github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 github.com/rwcarlsen/goexif v0.0.0-20150520140647-709fab3d192d github.com/sirupsen/logrus v1.4.2 - github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect golang.org/x/image v0.0.0-20170322222000-c0851fbc5b92 golang.org/x/text v0.3.0 ) -go 1.13 +require ( + github.com/felixge/httpsnoop v1.0.0 // indirect + github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/jmespath/go-jmespath v0.3.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect + golang.org/x/sys v0.0.0-20190422165155-953cdadca894 // indirect +) + +go 1.19 diff --git a/go.sum b/go.sum index 7d86b3e..b1ae3dd 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g= github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966/go.mod h1:Mid70uvE93zn9wgF92A/r5ixgnvX8Lh68fxp9KQBaI0= -github.com/aws/aws-sdk-go v0.0.0-20170327234658-de61b9d1e0c7 h1:8aDeF5yh95gNmowC8pW6EBtvQjjEiZhMkYVWBrwWS04= -github.com/aws/aws-sdk-go v0.0.0-20170327234658-de61b9d1e0c7/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.31.7 h1:TCA+pXKvzDMA3vVqhK21cCy5GarC8pTQb/DrVOWI3iY= github.com/aws/aws-sdk-go v1.31.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/chai2010/webp v1.1.0 h1:4Ei0/BRroMF9FaXDG2e4OxwFcuW2vcXd+A6tyqTJUQQ= @@ -11,23 +9,17 @@ 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/felixge/httpsnoop v1.0.0 h1:gh8fMGz0rlOv/1WmRZm7OgncIOTsAj21iNJot48omJQ= github.com/felixge/httpsnoop v1.0.0/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8= -github.com/go-ini/ini v1.26.0 h1:L6QZOsKl6CI5DGgGpt1GUXwd5Vu87eq0LEg3Wum8iVM= -github.com/go-ini/ini v1.26.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5 h1:yrv1uUvgXH/tEat+wdvJMRJ4g51GlIydtDpU9pFjaaI= github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/ieee0824/libcmyk v0.0.0-20171222081915-8cf9151a408c h1:lZIOmqDjhSYVjRKP2uDatozIISiwqf2SKdJiY9guH/8= github.com/ieee0824/libcmyk v0.0.0-20171222081915-8cf9151a408c/go.mod h1:vJVtPiJ4YFtcMk8WkYjRnhqve5VTNuURZ2qmD0yRdyE= github.com/ieee0824/logrus-formatter v1.0.0 h1:xGeQsIDW3Cap0t2be6xyT4CEu4QTTNXxRGv8+foASM8= github.com/ieee0824/logrus-formatter v1.0.0/go.mod h1:QM8kqMUENvvVuwCSSd/LoSewOx30414UpVUjWf/OdZQ= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 h1:SMvOWPJCES2GdFracYbBQh93GXac8fq7HeN6JnpduB8= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/mitchellh/go-server-timing v1.0.0 h1:cdHk4f7lxjwbRqTSGZFw8PCeoNYXGp4T4Sdr8wT+Xlw= @@ -41,25 +33,21 @@ github.com/rwcarlsen/goexif v0.0.0-20150520140647-709fab3d192d h1:0/OVHHIrQqGZxH github.com/rwcarlsen/goexif v0.0.0-20150520140647-709fab3d192d/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/image v0.0.0-20170322222000-c0851fbc5b92 h1:AloAkWcniQLRH6BBDYmfDDLFyQVV76LcIbWhnB5d2r0= golang.org/x/image v0.0.0-20170322222000-c0851fbc5b92/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 5c65ef37cc9e86636225ff2d5369193b4ef60cb2 Mon Sep 17 00:00:00 2001 From: mom0tomo Date: Tue, 17 Jan 2023 14:43:06 +0900 Subject: [PATCH 2/2] update README --- README.ja.md | 9 ++++----- README.md | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.ja.md b/README.ja.md index a531266..01272ee 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,6 +1,5 @@ # fanlin -[![Circle CI](https://circleci.com/gh/livesense-inc/fanlin/tree/master.svg?style=shield)](https://circleci.com/gh/livesense-inc/fanlin/tree/master) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) [English](README.md) | 日本語 @@ -12,10 +11,10 @@ Amazon S3と外部HTTPサーバー上の画像をリアルタイムで加工す ## 環境 ### OS * Linux (x86 and amd64) -* OS X +* macOS ### Go Versions -* go 1.13.x +* go 1.19.x ## 対応画像フォーマット * JPEG @@ -23,12 +22,12 @@ Amazon S3と外部HTTPサーバー上の画像をリアルタイムで加工す * GIF * WebP -## OS X の環境構築 +## macOS の環境構築 ## master pushの悲劇を防ぐために [ここを参考に設定すること](http://ganmacs.hatenablog.com/entry/2014/06/18/224132) ## Linux用にクロスコンパイルする -### go1.13 +### go1.19 ``` $ GOOS=linux GOARCH=amd64 go build github.com/livesense-inc/fanlin/cmd/fanlin ``` diff --git a/README.md b/README.md index b3fb3a9..b235a2f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # fanlin -[![Circle CI](https://circleci.com/gh/livesense-inc/fanlin/tree/master.svg?style=shield)](https://circleci.com/gh/livesense-inc/fanlin/tree/master) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) English | [日本語](README.ja.md) @@ -11,10 +10,10 @@ fanlin is image proxy server in native Go language. ## Support ### OS * Linux (x86 and amd64) -* OS X +* macOS ### Go Versions -* go 1.13.x +* go 1.19.x ### Image Format * JPEG @@ -23,7 +22,7 @@ fanlin is image proxy server in native Go language. * WebP ## Cross compile for amd64 Linux -### go 1.13 +### go 1.19 ``` $ GOOS=linux GOARCH=amd64 go build github.com/livesense-inc/fanlin/cmd/fanlin ``` @@ -34,7 +33,7 @@ $ go test -cover ./... ``` ## configure -On Unix, Linux and OS X, fanlin programs read startup options from the following files, in the specified order(top files are read first, and precedence). +On Unix, Linux and macOS, fanlin programs read startup options from the following files, in the specified order(top files are read first, and precedence). ``` /etc/fanlin.json