Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Commit

Permalink
no symlinks + apt-get install (#1169)
Browse files Browse the repository at this point in the history
Signed-off-by: Artyom Bakhtin <[email protected]>
  • Loading branch information
bakhtin authored Apr 9, 2018
1 parent f63a9ac commit 321d6bf
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .jenkinsci/release-build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def doReleaseBuild() {
sh "curl -L -o /tmp/${env.GIT_COMMIT}/entrypoint.sh https://raw.githubusercontent.com/hyperledger/iroha/${env.GIT_COMMIT}/docker/release/${platform}/entrypoint.sh"
sh "cp /tmp/${GIT_COMMIT}-${BUILD_NUMBER}/iroha.deb /tmp/${env.GIT_COMMIT}"
sh "chmod +x /tmp/${env.GIT_COMMIT}/entrypoint.sh"
iCRelease = docker.build("hyperledger/iroha:${GIT_COMMIT}-${BUILD_NUMBER}-release", "-f /tmp/${env.GIT_COMMIT}/Dockerfile /tmp/${env.GIT_COMMIT}")
iCRelease = docker.build("hyperledger/iroha:${GIT_COMMIT}-${BUILD_NUMBER}-release", "--no-cache -f /tmp/${env.GIT_COMMIT}/Dockerfile /tmp/${env.GIT_COMMIT}")
docker.withRegistry('https://registry.hub.docker.com', 'docker-hub-credentials') {
if (env.BRANCH_NAME == 'develop') {
iCRelease.push("${platform}-develop-latest")
Expand Down
1 change: 0 additions & 1 deletion docker/release/aarch64/Dockerfile

This file was deleted.

15 changes: 15 additions & 0 deletions docker/release/aarch64/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:16.04

RUN apt-get update; \
apt-get install -y libc-ares-dev

#Install iroha
COPY iroha.deb /tmp/iroha.deb
RUN apt-get install -y /tmp/iroha.deb; \
rm -f /tmp/iroha.deb

WORKDIR /opt/iroha_data

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/sbin/init"]
1 change: 0 additions & 1 deletion docker/release/aarch64/entrypoint.sh

This file was deleted.

4 changes: 4 additions & 0 deletions docker/release/aarch64/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
echo key=$KEY
echo $PWD
irohad --genesis_block genesis.block --config config.sample --keypair_name $KEY
1 change: 0 additions & 1 deletion docker/release/armv7l/Dockerfile

This file was deleted.

15 changes: 15 additions & 0 deletions docker/release/armv7l/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:16.04

RUN apt-get update; \
apt-get install -y libc-ares-dev

#Install iroha
COPY iroha.deb /tmp/iroha.deb
RUN apt-get install -y /tmp/iroha.deb; \
rm -f /tmp/iroha.deb

WORKDIR /opt/iroha_data

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/sbin/init"]
1 change: 0 additions & 1 deletion docker/release/armv7l/entrypoint.sh

This file was deleted.

4 changes: 4 additions & 0 deletions docker/release/armv7l/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
echo key=$KEY
echo $PWD
irohad --genesis_block genesis.block --config config.sample --keypair_name $KEY
11 changes: 4 additions & 7 deletions docker/release/x86_64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
FROM ubuntu:16.04

RUN apt-get update;\
apt-get upgrade -y; \
apt-get install -y \
libc-ares-dev
RUN apt-get update; \
apt-get install -y libc-ares-dev

#Install iroha
COPY iroha.deb /tmp/iroha.deb
RUN dpkg -i /tmp/iroha.deb

RUN apt-get -fy install;rm -f /tmp/iroha.deb
RUN apt-get install -y /tmp/iroha.deb; \
rm -f /tmp/iroha.deb

WORKDIR /opt/iroha_data

Expand Down
1 change: 0 additions & 1 deletion docker/release/x86_64/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
echo key=$KEY
echo $PWD
iroha-cli --genesis_block --peers_address peers.list
irohad --genesis_block genesis.block --config config.sample --keypair_name $KEY

0 comments on commit 321d6bf

Please sign in to comment.