Skip to content

Commit

Permalink
Cleanup bin dir and move run scripts to bin
Browse files Browse the repository at this point in the history
  • Loading branch information
pmac committed Feb 22, 2017
1 parent 7a4ef8a commit e8d6ca6
Show file tree
Hide file tree
Showing 18 changed files with 13 additions and 212 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ shell: .docker-build
docker run --user `id -u` -it --env-file docker/dev.env -v "$$PWD:/app" ${DEV_IMG_NAME} bash

sync-all: .docker-build
docker run --user `id -u` --env-file docker/demo.env -v "$$PWD:/app" ${DEV_IMG_NAME} bin/sync_all
docker run --user `id -u` --env-file docker/demo.env -v "$$PWD:/app" ${DEV_IMG_NAME} bin/sync-all.sh

clean:
# python related things
Expand All @@ -69,10 +69,10 @@ clean:
-rm -f .docker-build-final

test: .docker-build
docker run --user `id -u` --env-file docker/test.env -v "$$PWD:/app" ${DEV_IMG_NAME} docker/run-tests.sh
docker run --user `id -u` --env-file docker/test.env -v "$$PWD:/app" ${DEV_IMG_NAME} bin/run-tests.sh

test-image: .docker-build-final
docker run --env-file docker/test.env ${FINAL_IMG_NAME} docker/run-tests.sh
docker run --env-file docker/test.env ${FINAL_IMG_NAME} bin/run-tests.sh

docs:
docker run --user `id -u` --env-file docker/dev.env -v "$$PWD:/app" ${DEV_IMG_NAME} bash -c "make -C docs/ clean && make -C docs/ html"
Expand Down
4 changes: 2 additions & 2 deletions Procfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
web: ./docker/run.sh
clock: ./docker/run-clock.sh
web: ./bin/run.sh
clock: ./bin/run-clock.sh
6 changes: 0 additions & 6 deletions bin/circleci-docker-build.sh

This file was deleted.

65 changes: 0 additions & 65 deletions bin/jenkins.sh

This file was deleted.

118 changes: 0 additions & 118 deletions bin/pipstrap.py

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docker/run.sh → bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
RUN_SUPERVISOR=$(echo "$RUN_SUPERVISOR" | tr '[:upper:]' '[:lower:]')

if [[ "$RUN_SUPERVISOR" == "true" ]]; then
exec docker/run-supervisor.sh
exec bin/run-supervisor.sh
else
exec docker/run-prod.sh
exec bin/run-prod.sh
fi
File renamed without changes.
10 changes: 0 additions & 10 deletions bin/upgrade-pip.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docker/dockerfiles/bedrock_base
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN adduser --uid 1000 --disabled-password --gecos '' --no-create-home webdev

WORKDIR /app
EXPOSE 8000
CMD ["./docker/run.sh"]
CMD ["./bin/run.sh"]

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion docker/dockerfiles/bedrock_test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mozorg/bedrock_code:${GIT_COMMIT}

CMD ["./docker/run-tests.sh"]
CMD ["./bin/run-tests.sh"]
USER root

RUN pip install --no-cache-dir -r requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion docker/jenkins/build_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fi

# include the data that the deployments need
if $DEMO_MODE && ! imageExists "demo"; then
dockerRun demo code bin/sync_all
dockerRun demo code bin/sync-all.sh
docker/jenkins/docker_build.sh "demo"
fi
if $PROD_MODE && ! imageExists "l10n"; then
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ You shouldn't need to customize anything in there yet.

Sync the database and all of the external data locally. This gets product-details, security-advisories, credits, release notes, etc::

$ bin/sync_all
$ bin/sync-all.sh

Lastly, you need to have `Node.js <https://nodejs.org/>`_ and
`NPM <https://docs.npmjs.com/getting-started/installing-node>`_ installed. The node
Expand Down
2 changes: 1 addition & 1 deletion etc/supervisor_available/bedrock.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:bedrock]
command = /app/docker/run-prod.sh
command = /app/bin/run-prod.sh
numprocs = 1
autostart = true
redirect_stderr = true
Expand Down
2 changes: 1 addition & 1 deletion etc/supervisor_available/cron_db.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:cron_db]
command = /app/docker/run-clock.sh
command = /app/bin/run-clock.sh
numprocs = 1
autostart = true
redirect_stderr = true
Expand Down

0 comments on commit e8d6ca6

Please sign in to comment.