summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Titov <[email protected]>2020-02-24 20:22:20 +0300
committerGitHub <[email protected]>2020-02-24 20:22:20 +0300
commitf9c4839266ff5c9aa289b2db0dae1e157011ffd3 (patch)
tree84c84c3d27cc8058889f90ca9a9efc05e18ce528
parente20ca47c80fbaa5734bcec5e25691c8d23127c48 (diff)
parentc0f751d2af77624d7a54afeca3a1fb7829abc367 (diff)
Merge pull request #256 from spiral/update_dockerfile
Update dockerfile, remove ./rr -v as always failing, update go version to 1.13
-rw-r--r--.github/workflows/ci-build.yml3
-rw-r--r--Dockerfile3
2 files changed, 1 insertions, 5 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index cf63195c..b0977521 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -121,6 +121,3 @@ jobs:
- name: Build image
run: docker build -t rr:local -f Dockerfile .
-
- - name: Try to execute
- run: docker run --rm rr:local -v
diff --git a/Dockerfile b/Dockerfile
index 4ea56dc3..4a355831 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Image page: <https://hub.docker.com/_/golang>
-FROM golang:1.12-alpine as builder
+FROM golang:1.13-alpine as builder
COPY . /src
@@ -9,7 +9,6 @@ RUN set -x \
&& apk add --no-cache bash git \
&& go version \
&& bash ./build.sh \
- && ./rr -v \
&& test -f ./.rr.yaml
FROM alpine:latest