Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for ARM64 (Fixes #22) #25

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Support for ARM64 (Fixes #22) #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
09b7b5c
Update base image for 2.1.1
sahilph May 22, 2018
a330f47
Change base for 2.1.0
sahilph May 22, 2018
ce14cc6
Change base for 2.0.0
sahilph May 22, 2018
0eaa494
Change base for 1.7.1
sahilph May 22, 2018
4892d40
Updated libicu version to 55
sahilph May 22, 2018
238e8fd
Revert "Updated libicu version to 55"
sahilph May 22, 2018
cca54eb
Change all bases to raspbian
sahilph May 22, 2018
328ce3d
Add travis update param
sahilph May 22, 2018
5762828
No need to check tini
sahilph May 22, 2018
71f2f5e
Revert "No need to check tini"
sahilph May 22, 2018
a8a070d
Check if tini exists
sahilph May 24, 2018
3cd21c4
fix syntax
sahilph May 24, 2018
e084018
Add support for arm64 (Fixes #22)
sahilph May 29, 2018
f7573c5
Fix Syntax for arm64
sahilph May 29, 2018
0b7c209
fix arm64 vars
sahilph May 29, 2018
af644c6
Even more var fixes
sahilph May 29, 2018
4ac3874
Merge branch 'master' into add-arm64-support
sahilph Jun 11, 2018
7a81fe4
32 on 64
sahilph Jun 11, 2018
4125c14
Change mozjs get method
sahilph Jun 11, 2018
656662e
No need of the gdebi and mozjs copy
sahilph Jun 11, 2018
538f9fb
Fix syntax
sahilph Jun 11, 2018
d3e792c
Modify travis util
sahilph Jun 11, 2018
3f295a1
Change branch condition to current branch for testing
sahilph Jun 11, 2018
5067b76
Revert "Change branch condition to current branch for testing"
sahilph Jun 11, 2018
8390b4c
Manifest tag fix
sahilph Jun 11, 2018
5a2b63c
sed fix
sahilph Jun 12, 2018
0dd1671
Update readme
sahilph Jun 12, 2018
a0db802
Merge branch 'master' into add-arm64-support
sahilph Jul 24, 2018
0dfca2e
Fix Conflicts, Delete Obselete versions
sahilph Jul 24, 2018
883ab46
Fix vars
sahilph Jul 24, 2018
e3fff74
Fix even more vars
sahilph Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .travis/deploy_docker_rpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ build_message Build V212 image started...
deploy_v212
build_message Build V212 image finished, check build result!

build_message Build V172 arm64 image started...
deploy_v172_arm64
build_message Build V172 arm64 image finished, check build result!

build_message Build V212 arm64 image started...
deploy_v212_arm64
build_message Build V212 arm64 image finished, check build result!

build_message Preparing to Push multi-arch manifest to Docker Cloud ..
deploy_multiarch

8 changes: 6 additions & 2 deletions .travis/multiarch_manifests/multiarch_manifest_latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ manifests:
architecture: arm
os: linux
-
image: amd64/couchdb:2.1.2
image: treehouses/rpi-couchdb:arm64-2.1.2
platform:
architecture: arm64
os: linux
-
image: amd64/couchdb:2.1.1
platform:
architecture: amd64
os: linux

5 changes: 5 additions & 0 deletions .travis/multiarch_manifests/multiarch_manifest_v1.7.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ manifests:
platform:
architecture: arm
os: linux
-
image: treehouses/rpi-couchdb:arm64-1.7.2
platform:
architecture: arm64
os: linux
-
image: amd64/couchdb:1.7.2
platform:
Expand Down
5 changes: 5 additions & 0 deletions .travis/multiarch_manifests/multiarch_manifest_v2.1.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ manifests:
platform:
architecture: arm
os: linux
-
image: treehouses/rpi-couchdb:arm64-2.1.2
platform:
architecture: arm64
os: linux
-
image: amd64/couchdb:2.1.2
platform:
Expand Down
80 changes: 21 additions & 59 deletions .travis/travis_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ prepare_package(){
if [ -z "$COMMIT" ]; then
COMMIT=${TRAVIS_COMMIT::8}
fi
V200_DOCKER_NAME=$DOCKER_ORG/$DOCKER_REPO:2.0.0-$VERSION-$BRANCH-$COMMIT
V200_DOCKER_NAME_LATEST=$DOCKER_ORG/$DOCKER_REPO:2.0.0
V210_DOCKER_NAME=$DOCKER_ORG/$DOCKER_REPO:2.1.0-$VERSION-$BRANCH-$COMMIT
V210_DOCKER_NAME_LATEST=$DOCKER_ORG/$DOCKER_REPO:2.1.0
v212_DOCKER_NAME=$DOCKER_ORG/$DOCKER_REPO:2.1.2-$VERSION-$BRANCH-$COMMIT
v212_DOCKER_NAME_LATEST=$DOCKER_ORG/$DOCKER_REPO:2.1.2
v172_DOCKER_NAME=$DOCKER_ORG/$DOCKER_REPO:1.7.2-$VERSION-$BRANCH-$COMMIT
Expand All @@ -45,30 +41,6 @@ package_v172(){
fi
}

package_v200(){
build_message processing $V200_DOCKER_NAME
docker build 2.0.0/ -t $V200_DOCKER_NAME
build_message done processing $V200_DOCKER_NAME
if [ "$BRANCH" = "master" ]
then
build_message processing $V200_DOCKER_NAME_LATEST
docker tag $V200_DOCKER_NAME $V200_DOCKER_NAME_LATEST
build_message done processing $V200_DOCKER_NAME_LATEST
fi
}

package_v210(){
build_message processing $V210_DOCKER_NAME
docker build 2.1.0/ -t $V210_DOCKER_NAME
build_message done processing $V210_DOCKER_NAME
if [ "$BRANCH" = "master" ]
then
build_message processing $V210_DOCKER_NAME_LATEST
docker tag $V210_DOCKER_NAME $V210_DOCKER_NAME_LATEST
build_message done processing $V210_DOCKER_NAME_LATEST
fi
}

package_v212(){
build_message processing $v212_DOCKER_NAME
docker build 2.1.2/ -t $v212_DOCKER_NAME
Expand All @@ -93,30 +65,6 @@ push_v172(){
fi
}

push_v200(){
build_message pushing $V200_DOCKER_NAME
docker push $V200_DOCKER_NAME
build_message done pushing $V200_DOCKER_NAME
if [ "$BRANCH" = "master" ]
then
build_message pushing $V200_DOCKER_NAME_LATEST
docker push $V200_DOCKER_NAME_LATEST
build_message done pushing $V200_DOCKER_NAME_LATEST
fi
}

push_v210(){
build_message pushing $V210_DOCKER_NAME
docker push $V210_DOCKER_NAME
build_message done pushing $V210_DOCKER_NAME
if [ "$BRANCH" = "master" ]
then
build_message pushing $V210_DOCKER_NAME_LATEST
docker push $V210_DOCKER_NAME_LATEST
build_message done pushing $V210_DOCKER_NAME_LATEST
fi
}

push_v212(){
build_message pushing $v212_DOCKER_NAME
docker push $v212_DOCKER_NAME
Expand All @@ -135,20 +83,34 @@ deploy_v172(){
push_v172
}

deploy_v200(){

deploy_v212(){
login_docker
package_v200
push_v200
package_v212
push_v212
}

deploy_v210(){
deploy_v172_arm64(){
login_docker
package_v210
push_v210
sed -i -e "s/\(resin\/rpi-raspbian\)/resin\/aarch64-debian/" 1.7.2/Dockerfile
v172_DOCKER_NAME_LATEST="$DOCKER_ORG/$DOCKER_REPO:arm64-1.7.2"
v172_DOCKER_NAME="$DOCKER_ORG/$DOCKER_REPO:arm64-1.7.2-$VERSION-$BRANCH-$COMMIT"
package_v172
push_v172
}

deploy_v212(){
deploy_v212_arm64(){
login_docker
rm 2.1.2/Dockerfile
mv 2.1.2/Dockerfile-arm64 2.1.2/Dockerfile
if [ "$BRANCH" = "master" ]
then
sed -i -e "s|\(treehouses\/rpi-couchdb:2\.1\.2\)|$v212_DOCKER_NAME_LATEST|" 2.1.2/Dockerfile
else
sed -i -e "s|\(treehouses\/rpi-couchdb:2\.1\.2\)|$v212_DOCKER_NAME|" 2.1.2/Dockerfile
fi
v212_DOCKER_NAME_LATEST="$DOCKER_ORG/$DOCKER_REPO:arm64-2.1.2"
v212_DOCKER_NAME="$DOCKER_ORG/$DOCKER_REPO:arm64-2.1.2-$VERSION-$BRANCH-$COMMIT"
package_v212
push_v212
}
Expand Down
127 changes: 0 additions & 127 deletions 2.0.0/Dockerfile
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions 2.0.0/crosscompile.sh
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions 2.0.0/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions 2.0.0/local.ini
View file
Open in desktop

This file was deleted.

Loading