Skip to content
This repository has been archived by the owner on Apr 17, 2022. It is now read-only.

Commit

Permalink
Fixed docker build error, Go upgrade 1.14 -> 1.15
Browse files Browse the repository at this point in the history
Signed-off-by: nmapx <mt@ngen.pl>
  • Loading branch information
nmapx committed Jan 30, 2021
1 parent bba4044 commit cb8a835
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 38 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 nmapx
Copyright (c) 2021 nmapx

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14-alpine
FROM golang:1.15-alpine

ARG HOST_UID
ARG GO111MODULE
Expand Down Expand Up @@ -31,7 +31,7 @@ RUN adduser -D -u ${HOST_UID} -s /bin/bash docker && \
chown -R docker:docker .
USER docker

RUN make -f Makefile.native get
RUN go get

ENTRYPOINT ["./docker/app/entrypoint.sh"]
CMD ["run"]
2 changes: 1 addition & 1 deletion docker/app/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

if [ "$1" = "run" ]
then exec make -f Makefile.native run
then exec go run .
elif [ "$1" = "loop" ]
then exec sh -c "while true; do echo ping; sleep 1; done"
fi
Expand Down
23 changes: 13 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
module github.com/nmapx/revolut-stocks-list

go 1.14
go 1.15

require (
github.com/disintegration/imaging v1.6.2
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.3.2 // indirect
github.com/otiai10/gosseract/v2 v2.2.4
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/piquette/finance-go v1.0.0
github.com/pelletier/go-toml v1.8.0 // indirect
github.com/piquette/finance-go v1.0.1-0.20190922201338-e2d6921ec6d7
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/afero v1.3.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.1
golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 // indirect
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
golang.org/x/text v0.3.2 // indirect
gopkg.in/yaml.v2 v2.2.7 // indirect
github.com/spf13/viper v1.7.0
golang.org/x/image v0.0.0-20200618115811-c13761719519 // indirect
golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect
golang.org/x/text v0.3.3 // indirect
gopkg.in/ini.v1 v1.57.0 // indirect
)
Loading

0 comments on commit cb8a835

Please sign in to comment.