mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 04:14:39 +03:00
Update to golang 1.13 (#754)
* Update to use golang 1.13 * Update node and ubuntu versions * Update compiler version
This commit is contained in:
@@ -5,7 +5,7 @@ git:
|
|||||||
depth: false
|
depth: false
|
||||||
language: go
|
language: go
|
||||||
go:
|
go:
|
||||||
- 1.11.x
|
- 1.13.x
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
env:
|
env:
|
||||||
@@ -23,7 +23,7 @@ script:
|
|||||||
#- make lint
|
#- make lint
|
||||||
- make fmt-check vet it
|
- make fmt-check vet it
|
||||||
after_success:
|
after_success:
|
||||||
- docker pull stashapp/compiler:develop
|
- docker pull stashapp/compiler:4
|
||||||
- sh ./scripts/cross-compile.sh
|
- sh ./scripts/cross-compile.sh
|
||||||
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
|
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
|
||||||
before_deploy:
|
before_deploy:
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
# ie from top=level stash:
|
# ie from top=level stash:
|
||||||
# docker build -t stash/build -f docker/build/x86_64/Dockerfile .
|
# docker build -t stash/build -f docker/build/x86_64/Dockerfile .
|
||||||
|
|
||||||
FROM golang:1.11.13 as compiler
|
FROM golang:1.13.15 as compiler
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y apt-transport-https
|
RUN apt-get update && apt-get install -y apt-transport-https
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
|
RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
|
||||||
|
|
||||||
# prevent caching of the key
|
# prevent caching of the key
|
||||||
ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
|
ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
|
||||||
@@ -48,7 +48,7 @@ RUN make generate
|
|||||||
RUN make ui
|
RUN make ui
|
||||||
RUN make build
|
RUN make build
|
||||||
|
|
||||||
FROM ubuntu:19.10 as app
|
FROM ubuntu:20.04 as app
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install ca-certificates
|
RUN apt-get update && apt-get -y install ca-certificates
|
||||||
COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
# must be built from /dist directory
|
# must be built from /dist directory
|
||||||
|
|
||||||
FROM ubuntu:18.04 as prep
|
FROM ubuntu:20.04 as prep
|
||||||
LABEL MAINTAINER="https://discord.gg/Uz29ny"
|
LABEL MAINTAINER="https://discord.gg/Uz29ny"
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
@@ -16,7 +16,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
|
|||||||
rm ffmpeg.tar.xz && \
|
rm ffmpeg.tar.xz && \
|
||||||
mv /ffmpeg*/ /ffmpeg/
|
mv /ffmpeg*/ /ffmpeg/
|
||||||
|
|
||||||
FROM ubuntu:18.04 as app
|
FROM ubuntu:20.04 as app
|
||||||
RUN apt-get update && apt-get -y install ca-certificates
|
RUN apt-get update && apt-get -y install ca-certificates
|
||||||
COPY --from=prep /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
COPY --from=prep /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
||||||
COPY /stash-linux /usr/bin/stash
|
COPY /stash-linux /usr/bin/stash
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM golang:1.11.5
|
FROM golang:1.13.15
|
||||||
|
|
||||||
LABEL maintainer="stashappdev@gmail.com"
|
LABEL maintainer="stashappdev@gmail.com"
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@ ENV PACKR2_DOWNLOAD_URL=https://github.com/gobuffalo/packr/releases/download/v${
|
|||||||
|
|
||||||
# Install tools
|
# Install tools
|
||||||
RUN apt-get update && apt-get install -y apt-transport-https
|
RUN apt-get update && apt-get install -y apt-transport-https
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
|
RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
|
||||||
|
|
||||||
# prevent caching of the key
|
# prevent caching of the key
|
||||||
ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
|
ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
|
||||||
@@ -21,7 +21,7 @@ RUN apt-get update && \
|
|||||||
apt-get install -y automake autogen \
|
apt-get install -y automake autogen \
|
||||||
libtool libxml2-dev uuid-dev libssl-dev bash \
|
libtool libxml2-dev uuid-dev libssl-dev bash \
|
||||||
patch make tar xz-utils bzip2 gzip sed cpio \
|
patch make tar xz-utils bzip2 gzip sed cpio \
|
||||||
gcc-6-multilib g++-6-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
|
gcc-8-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
|
||||||
gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
|
gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
|
||||||
gcc-arm-linux-gnueabihf libc-dev-armhf-cross \
|
gcc-arm-linux-gnueabihf libc-dev-armhf-cross \
|
||||||
gcc-aarch64-linux-gnu libc-dev-arm64-cross \
|
gcc-aarch64-linux-gnu libc-dev-arm64-cross \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
user=stashapp
|
user=stashapp
|
||||||
repo=compiler
|
repo=compiler
|
||||||
version=3
|
version=4
|
||||||
|
|
||||||
latest:
|
latest:
|
||||||
docker build -t ${user}/${repo}:latest .
|
docker build -t ${user}/${repo}:latest .
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
|
Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
|
||||||
|
|
||||||
|
When the dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to docker hub. The `scripts/cross-compile.sh` script should also be updated to use the new version number tag, and `.travis.yml` needs to be updated to pull the correct image tag.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:18.04 as prep
|
FROM ubuntu:20.04 as prep
|
||||||
LABEL MAINTAINER="https://discord.gg/Uz29ny"
|
LABEL MAINTAINER="https://discord.gg/Uz29ny"
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
@@ -17,7 +17,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
|
|||||||
rm ffmpeg.tar.xz && \
|
rm ffmpeg.tar.xz && \
|
||||||
mv /ffmpeg*/ /ffmpeg/
|
mv /ffmpeg*/ /ffmpeg/
|
||||||
|
|
||||||
FROM ubuntu:18.04 as app
|
FROM ubuntu:20.04 as app
|
||||||
RUN apt-get update && apt-get -y install ca-certificates
|
RUN apt-get update && apt-get -y install ca-certificates
|
||||||
COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
||||||
EXPOSE 9999
|
EXPOSE 9999
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:18.04 as prep
|
FROM ubuntu:20.04 as prep
|
||||||
LABEL MAINTAINER="leopere [at] nixc [dot] us"
|
LABEL MAINTAINER="leopere [at] nixc [dot] us"
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
@@ -17,7 +17,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
|
|||||||
rm ffmpeg.tar.xz && \
|
rm ffmpeg.tar.xz && \
|
||||||
mv /ffmpeg*/ /ffmpeg/
|
mv /ffmpeg*/ /ffmpeg/
|
||||||
|
|
||||||
FROM ubuntu:18.04 as app
|
FROM ubuntu:20.04 as app
|
||||||
RUN apt-get update && apt-get -y install ca-certificates
|
RUN apt-get update && apt-get -y install ca-certificates
|
||||||
COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
|
||||||
EXPOSE 9999
|
EXPOSE 9999
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -36,4 +36,4 @@ require (
|
|||||||
|
|
||||||
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
|
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
|
||||||
|
|
||||||
go 1.11
|
go 1.13
|
||||||
|
|||||||
@@ -14,4 +14,4 @@ LINUX_ARM32v6="echo '=== Building Linux (armv6 | Raspberry Pi 1) binary ==='; $S
|
|||||||
|
|
||||||
COMMAND="$SETUP $WINDOWS $DARWIN $LINUX_AMD64 $LINUX_ARM64v8 $LINUX_ARM32v7 $LINUX_ARM32v6 echo '=== Build complete ==='"
|
COMMAND="$SETUP $WINDOWS $DARWIN $LINUX_AMD64 $LINUX_ARM64v8 $LINUX_ARM32v7 $LINUX_ARM32v6 echo '=== Build complete ==='"
|
||||||
|
|
||||||
docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:develop /bin/bash -c "$COMMAND"
|
docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:4 /bin/bash -c "$COMMAND"
|
||||||
|
|||||||
Reference in New Issue
Block a user