From 848eb35c20eb399166196ec81c1e0e511725a599 Mon Sep 17 00:00:00 2001
From: Alex Peters <alpe@users.noreply.github.com>
Date: Tue, 25 Jan 2022 10:08:54 +0100
Subject: [PATCH] Fix docker build issues with most recent remote docker
 version in CI

---
 .circleci/config.yml | 16 ++++++++++------
 Dockerfile           |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b4a50ecebf..c65b1de842 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,7 +143,9 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          # >= v20.10 https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
+          version: 20.10.11
       - run:
           name: Build Docker artifact
           command: docker build --pull -t "cosmwasm/wasmd:${CIRCLE_SHA1}" .
@@ -163,7 +165,9 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          # >= v20.10 https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
+          version: 20.10.11
       - run:
           name: Build Docker artifact
           command: docker build --pull -t "cosmwasm/wasmd:${CIRCLE_TAG}" .
@@ -182,10 +186,10 @@ workflows:
       - docker-image:
           requires:
             - setup-dependencies
-          filters:
-            branches:
-              only:
-                - master
+#          filters:
+#            branches:
+#              only:
+#                - master
       - docker-tagged:
           filters:
             tags:
diff --git a/Dockerfile b/Dockerfile
index c4ca49004b..c261ca3002 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # docker build . -t cosmwasm/wasmd:latest
 # docker run --rm -it cosmwasm/wasmd:latest /bin/sh
-FROM golang:1.17.3-alpine AS go-builder
+FROM golang:1.17-alpine3.15 AS go-builder
 
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
@@ -22,7 +22,7 @@ RUN sha256sum /lib/libwasmvm_muslc.a | grep d16a2cab22c75dbe8af32265b9346c626607
 RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build
 
 # --------------------------------------------------------
-FROM alpine:3.13
+FROM alpine:3.15
 
 COPY --from=go-builder /code/build/wasmd /usr/bin/wasmd