This repository has been archived by the owner on Aug 7, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Reduce image sizes for docker images * bump version * Merge branch 'development' into docker_for_local_mode # Conflicts: # version.txt * working docker in local mode! * expose external port to aimmo-game * detach aimmo-game-worker running from aimmo-game process * delete previously running containers before creating new ones * make docker container naming consistent with k8s * make docker host os agnostic * remove unnecessary log statement * only re install deps if they have changed * change hosts * add Portainer instructions to usage, and small intro paragraph * try to get host.docker.internal working on both linux and mac * Merge branch 'docker_for_local_mode' of https://github.com/ocadotechnology/aimmo into docker_for_local_mode * get port from env variable * os dependent host * use a template for container kwargs * pass CONTAINER_TEMPLATE into worker * provide default for LOCALHOST_IP * provide defaults for environment variables to do with docker * fix tests by mocking docker * Adding docker install to travis to try and fix tests. * Remove logs and adjust blank lines. * Added settings to make Docker for local work for Ubuntu machines. * Merge branch 'development' into docker_for_local_mode * Remove extra whitespaces * Merge branch 'docker_for_local_mode' of https://github.com/ocadotechnology/aimmo into docker_for_local_mode * Merge branch 'development' of https://github.com/ocadotechnology/aimmo into docker_for_local_mode * Bumped up version by minor change. * Move docker logic into a separate file Since docker setup is not related to minikube anymore * inject env variables for aimmo-game * Merge branch 'development' into docker_for_local_mode # Conflicts: # version.txt * remove newline in version file * remove docker entrypoint scripts * change experimental settings back to original values * add time.sleep back to run script * Code review changes * Docstring changes and delete stopped aimmo containers as well * change port setting back to original value * fix docker version * add missing quote * Don’t fix versions in Pipfile as they are in the Pipfile.lock * Update aimmo-game/Pipfile.lock * Conform to pep8 * remove bash and curl from dockerfile * Merge branch 'development' into docker_for_local_mode # Conflicts: # aimmo-game/Pipfile # aimmo-game/Pipfile.lock # aimmo-game/service.py # version.txt
- Loading branch information
1 parent
a58bb6e
commit 6aedc9c
Showing
24 changed files
with
342 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,14 @@ FROM python:2-alpine | |
|
||
MAINTAINER [email protected] | ||
|
||
COPY . . | ||
|
||
RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev | ||
|
||
RUN pip install pipenv | ||
|
||
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"] | ||
|
||
RUN pipenv install --system --deploy | ||
|
||
COPY . . | ||
|
||
CMD ["python", "./service.py"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,14 @@ FROM python:2-alpine | |
|
||
MAINTAINER [email protected] | ||
|
||
COPY . . | ||
|
||
RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev | ||
|
||
RUN pip install pipenv | ||
|
||
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"] | ||
|
||
RUN pipenv install --system --deploy | ||
|
||
COPY . . | ||
|
||
CMD python service.py 0.0.0.0 5000 $DATA_URL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,12 +4,14 @@ MAINTAINER [email protected] | |
|
||
ENV WORKER_MANAGER=kubernetes | ||
|
||
COPY . . | ||
|
||
RUN apk add --no-cache gcc musl-dev python-dev libffi-dev openssl-dev | ||
|
||
RUN pip install pipenv | ||
|
||
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"] | ||
|
||
RUN pipenv install --system --deploy | ||
|
||
CMD ["python", "./service.py", "0.0.0.0", "5000"] | ||
COPY . . | ||
|
||
CMD ["python", "./service.py", "0.0.0.0"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.