Skip to content

Commit

Permalink
Dockerfile: revert babea3c to fix issues on cross arch build
Browse files Browse the repository at this point in the history
  • Loading branch information
nirui committed Sep 14, 2022
1 parent 80665a0 commit ff3131e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the build base environment
FROM golang:bullseye AS base
FROM ubuntu:devel AS base
RUN set -ex && \
cd / && \
echo '#!/bin/sh' > /try.sh && echo 'res=0; for i in $(seq 0 36); do $@; res=$?; [ $res -eq 0 ] && exit $res || sleep 10; done; exit $res' >> /try.sh && chmod +x /try.sh && \
Expand All @@ -9,11 +9,12 @@ RUN set -ex && \
([ -z "$HTTP_PROXY" ] || (echo "Acquire::http::Proxy \"$HTTP_PROXY\";" >> /etc/apt/apt.conf)) && \
([ -z "$HTTPS_PROXY" ] || (echo "Acquire::https::Proxy \"$HTTPS_PROXY\";" >> /etc/apt/apt.conf)) && \
(echo "Acquire::Retries \"8\";" >> /etc/apt/apt.conf) && \
echo '#!/bin/sh' > /install.sh && echo 'apt-get update && apt-get --fix-broken install autoconf automake libtool build-essential ca-certificates curl git npm libvips libvips-dev -y' >> /install.sh && chmod +x /install.sh && \
echo '#!/bin/sh' > /install.sh && echo 'apt-get update && apt-get --fix-broken install autoconf automake libtool build-essential ca-certificates curl git npm golang-go libvips libvips-dev -y' >> /install.sh && chmod +x /install.sh && \
/try.sh /install.sh && rm /install.sh && \
/try.sh update-ca-certificates -f && c_rehash && \
([ -z "$HTTP_PROXY" ] || (git config --global http.proxy "$HTTP_PROXY" && npm config set proxy "$HTTP_PROXY")) && \
([ -z "$HTTPS_PROXY" ] || (git config --global https.proxy "$HTTPS_PROXY" && npm config set https-proxy "$HTTPS_PROXY")) && \
export PATH=$PATH:"$(go env GOPATH)/bin" && \
([ -z "$CUSTOM_COMMAND" ] || (echo "Running custom command: $CUSTOM_COMMAND" && $CUSTOM_COMMAND)) && \
git version && \
go version && \
Expand Down

0 comments on commit ff3131e

Please sign in to comment.