Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Docker Improvements #5452

Closed
wants to merge 21 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5b114ad
Added contract build path to eosiocpp -g include paths
xJonathanLEI Aug 23, 2018
b9831d1
Fix framework casing for case sensitive MacOS builds
jgiszczak Aug 23, 2018
4b8ac5f
Merge pull request #5403 from EOSIO/fix-framework-casing-macosx
heifner Aug 23, 2018
4655c8f
Slight change
larryk85 Aug 24, 2018
5c378a9
Merge pull request #5401 from xJonathanLEI/fix_eosiocpp_g
jgiszczak Aug 27, 2018
4e962a7
Better dockerfile for ARGs and forked repo use
NorseGaud Aug 28, 2018
29cfe5c
New readme, docker-compose and also rename for testnet
NorseGaud Aug 28, 2018
e82a286
Better Readme title and quick fix
NorseGaud Aug 28, 2018
1aef2a5
Putting local volume location in user home
NorseGaud Aug 28, 2018
5ee4731
Remove if checks as they aren't working. Kept
NorseGaud Aug 28, 2018
97c218d
Added http-aliases back
NorseGaud Aug 28, 2018
ba7e971
- Removed builder from docker-compose.yml as it doesn't seem necessary
NorseGaud Aug 30, 2018
b7ba83c
Protection for missing genesis.json using testnet + Readme update
NorseGaud Aug 30, 2018
6231cb6
quick fix for exit in testnet setup sh
NorseGaud Aug 30, 2018
bf3f787
New design for ease of use and to keep things DRY
NorseGaud Aug 30, 2018
7bb44d2
Quick fix for volumes + setup sleep removal
NorseGaud Aug 30, 2018
14fa5e4
Support for ports in .env
NorseGaud Aug 30, 2018
ce0c55a
Minor fixes to get everything on the same page
NorseGaud Aug 30, 2018
f793e60
Readme fix
NorseGaud Aug 30, 2018
7c7510d
Readme fix
NorseGaud Aug 30, 2018
67916b9
Removed builder from latest docker-compose.yml
NorseGaud Aug 30, 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
Prev Previous commit
Next Next commit
Minor fixes to get everything on the same page
NorseGaud committed Aug 30, 2018
commit ce0c55a317f57e5ce3477ecfba3511447552b5b2
5 changes: 4 additions & 1 deletion Docker/dev/.env
Original file line number Diff line number Diff line change
@@ -5,7 +5,10 @@ GITHUB_ORG=EOSIO # You can find this on the github url: https://github.com/EOSIO
DOCKERHUB_USERNAME=eosio
IMAGE_NAME=eos-dev
IMAGE_TAG=latest
BUILD_SYMBOL=EOS
BUILD_SYMBOL=DEVOS
NODEOS_VOLUME_NAME=nodeos-dev-data-volume
NODEOS_PORT=9876
NODEOS_API_PORT=8888
KEOSD_VOLUME_NAME=keosd-dev-data-volume
KEOSD_API_PORT=8900
COMPOSE_PROJECT_NAME=dev
10 changes: 5 additions & 5 deletions Docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ services:
.env
container_name: "${COMPOSE_PROJECT_NAME}_nodeos"
image: "${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}"
command: "/opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e --http-alias=${COMPOSE_PROJECT_NAME}_nodeos:8888 --http-alias=127.0.0.1:8888 --http-alias=localhost:8888"
command: "/opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e --http-alias=${COMPOSE_PROJECT_NAME}_nodeos:8888 --http-alias=127.0.0.1:${NODEOS_API_PORT} --http-alias=localhost:${NODEOS_API_PORT}"
hostname: "${COMPOSE_PROJECT_NAME}_nodeos"
ports:
- 8888:8888
- 9876:9876
- $NODEOS_API_PORT:$NODEOS_API_PORT
- $NODEOS_PORT:$NODEOS_PORT
expose:
- "8888"
- "${NODEOS_API_PORT}"
volumes:
- ~/$NODEOS_VOLUME_NAME:/opt/eosio/bin/data-dir
cap_add:
@@ -30,7 +30,7 @@ services:
.env
container_name: "${COMPOSE_PROJECT_NAME}_keosd"
image: "${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}"
command: "/opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=${COMPOSE_PROJECT_NAME}_nodeos:8900 --http-alias=localhost:8900"
command: "/opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:${KEOSD_API_PORT} --http-alias=${COMPOSE_PROJECT_NAME}_keosd:${KEOSD_API_PORT} --http-alias=localhost:${KEOSD_API_PORT}"
hostname: "${COMPOSE_PROJECT_NAME}_keosd"
links:
- nodeos
3 changes: 3 additions & 0 deletions Docker/testnet/.env
Original file line number Diff line number Diff line change
@@ -7,5 +7,8 @@ IMAGE_NAME=eos
IMAGE_TAG=v1.1.0
BUILD_SYMBOL=EOS
NODEOS_VOLUME_NAME=nodeos-test-data-volume
NODEOS_PORT=9877
NODEOS_API_PORT=8889
KEOSD_VOLUME_NAME=keosd-test-data-volume
KEOSD_API_PORT=8901
COMPOSE_PROJECT_NAME=test
10 changes: 5 additions & 5 deletions Docker/testnet/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ services:
.env
container_name: "${COMPOSE_PROJECT_NAME}_nodeos"
image: "${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}"
command: "/opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e --http-alias=${COMPOSE_PROJECT_NAME}_nodeos:8888 --http-alias=127.0.0.1:8888 --http-alias=localhost:8888"
command: "/opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e --http-alias=${COMPOSE_PROJECT_NAME}_nodeos:8888 --http-alias=127.0.0.1:${NODEOS_API_PORT} --http-alias=localhost:${NODEOS_API_PORT}"
hostname: "${COMPOSE_PROJECT_NAME}_nodeos"
ports:
- 8888:8888
- 9876:9876
- $NODEOS_API_PORT:$NODEOS_API_PORT
- $NODEOS_PORT:$NODEOS_PORT
expose:
- "8888"
- "${NODEOS_API_PORT}"
volumes:
- ~/$NODEOS_VOLUME_NAME:/opt/eosio/bin/data-dir
cap_add:
@@ -30,7 +30,7 @@ services:
.env
container_name: "${COMPOSE_PROJECT_NAME}_keosd"
image: "${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}"
command: "/opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=${COMPOSE_PROJECT_NAME}_keosd:8900 --http-alias=localhost:8900"
command: "/opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:${KEOSD_API_PORT} --http-alias=${COMPOSE_PROJECT_NAME}_keosd:${KEOSD_API_PORT} --http-alias=localhost:${KEOSD_API_PORT}"
hostname: "${COMPOSE_PROJECT_NAME}_keosd"
links:
- nodeos