kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Update with manifest commands.

Browse Source
This commit is contained in:
James Cole
2019-02-09 06:40:55 +01:00
parent 21ddbd220a
commit 492c11784b
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.deploy/docker/build-generic.sh
View File

@@ -4,7 +4,7 @@
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
# get qemu-arm-static binary # get qemu-arm-static binary
if [ "$TRAVIS_BRANCH" != "amd64" ]; then if [ "$TRAVIS_BRANCH" == "arm" ]; then
mkdir tmp mkdir tmp
pushd tmp && \ pushd tmp && \
curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && \ curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && \
@@ -15,15 +15,14 @@ fi
# build develop # build develop
if [ "$TRAVIS_BRANCH" == "develop" ]; then if [ "$TRAVIS_BRANCH" == "develop" ]; then
echo "Build develop $ARCH" echo "Build develop $ARCH"
# > original command. docker build -t whoami --build-arg "arch=$ARCH" . docker build -t jc5x/firefly-iii:develop-$ARCH -f Dockerfile.$ARCH .
docker build -t jc5x/firefly-iii:develop-$ARCH -f Dockerfile.$ARCH --build-arg "arch=$ARCH" . docker push jc5x/firefly-iii:develop-$ARCH
#docker push jc5x/firefly-iii:develop
fi fi
#if [ "$TRAVIS_BRANCH" == "master" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then
# echo "Build master amd64" echo "Build master $ARCH"
# docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile . docker build -t jc5x/firefly-iii:latest-$ARCH -f Dockerfile.$ARCH .
# docker tag jc5x/firefly-iii:latest-amd jc5x/firefly-iii:release-$VERSION-amd docker tag jc5x/firefly-iii:latest-$ARCH jc5x/firefly-iii:release-$VERSION-$ARCH
# docker push jc5x/firefly-iii:latest-amd docker push jc5x/firefly-iii:latest-$ARCH
# docker push jc5x/firefly-iii:release-$VERSION-amd docker push jc5x/firefly-iii:release-$VERSION-$ARCH
#fi fi

2
.deploy/docker/entrypoint.sh
View File

@@ -2,6 +2,8 @@
echo "Now in entrypoint.sh for Firefly III" echo "Now in entrypoint.sh for Firefly III"
lscpu
# make sure the correct directories exists (suggested by @chrif): # make sure the correct directories exists (suggested by @chrif):
echo "Making directories..." echo "Making directories..."
mkdir -p $FIREFLY_PATH/storage/app/public mkdir -p $FIREFLY_PATH/storage/app/public

9
.deploy/docker/manifest.sh
View File

@@ -1,12 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Disabled until I can figure out how this works in Travis.
exit 0
if [ "$TRAVIS_BRANCH" == "develop" ]; then if [ "$TRAVIS_BRANCH" == "develop" ]; then
TARGET=jc5x/firefly-iii:develop TARGET=jc5x/firefly-iii:develop
ARM=jc5x/firefly-iii:develop-arm ARM=jc5x/firefly-iii:develop-arm
AMD=jc5x/firefly-iii:develop-amd AMD=jc5x/firefly-iii:develop-amd64
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux
@@ -19,7 +16,7 @@ echo "The version is $VERSION"
if [ "$TRAVIS_BRANCH" == "master" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then
TARGET=jc5x/firefly-iii:latest TARGET=jc5x/firefly-iii:latest
ARM=jc5x/firefly-iii:latest-arm ARM=jc5x/firefly-iii:latest-arm
AMD=jc5x/firefly-iii:latest-amd AMD=jc5x/firefly-iii:latest-amd64
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux
@@ -29,7 +26,7 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
# and another one for version specific: # and another one for version specific:
TARGET=jc5x/firefly-iii:release-$VERSION TARGET=jc5x/firefly-iii:release-$VERSION
ARM=jc5x/firefly-iii:release-$VERSION-arm ARM=jc5x/firefly-iii:release-$VERSION-arm
AMD=jc5x/firefly-iii:release-$VERSION-amd AMD=jc5x/firefly-iii:release-$VERSION-amd64
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux

4
.travis.yml
View File

@@ -1,8 +1,10 @@
sudo: required sudo: required
env: env:
global:
- VERSION=4.7.11
matrix: matrix:
- ARCH=arm - ARCH=arm
- ARCH=arm64 #- ARCH=arm64
- ARCH=amd64 - ARCH=amd64
dist: xenial dist: xenial

2
Dockerfile.amd64
View File

@@ -1,5 +1,5 @@
FROM php:7.2-apache FROM php:7.2-apache
ARG ARCH
ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
LABEL version="1.3" maintainer="thegrumpydictator@gmail.com" LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"

2
Dockerfile.arm
View File

@@ -1,5 +1,5 @@
FROM arm32v7/php:7.2.8-apache-stretch FROM arm32v7/php:7.2.8-apache-stretch
ARG TARGETPLATFORM ARG ARCH
COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
LABEL version="1.3" maintainer="thegrumpydictator@gmail.com" LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"

2
Dockerfile.arm64
View File

@@ -1,5 +1,5 @@
FROM arm32v7/php:7.2.8-apache-stretch FROM arm32v7/php:7.2.8-apache-stretch
ARG TARGETPLATFORM ARG ARCH
COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
LABEL version="1.3" maintainer="thegrumpydictator@gmail.com" LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"