Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Commit

Permalink
Merge pull request #35 from epics-containers/dev
Browse files Browse the repository at this point in the history
complete the rename
  • Loading branch information
gilesknap authored Jan 6, 2023
2 parents 9e3abbb + 128e21e commit 15b2b46
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN curl -L https://github.com/int128/kubelogin/releases/download/v1.25.3/kubelo

########## environment #########################################################

ENV DEV_PROMPT=U22
ENV DEV_PROMPT=E7

######### Stage to add a recent podman client ##################################

Expand Down
6 changes: 3 additions & 3 deletions docs/developer/tutorials/dev-install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ Build the container
-------------------
The following command will build the container locally::

podman build -t dev_u22 docker
podman build -t dev-e7 docker

If you have docker instead of podman just change podman to docker in the
above command.

This builds the container using the Dockerfile in the docker directory and
creates an image named dev_u22.
creates an image named dev-e7.

Run the container
-----------------

There is a launch script to launch the container (tagged with dev_u22) outside
There is a launch script to launch the container (tagged with dev-e7) outside
of VSCode. This allows you to test the container without using the
VSCode devcontainers::

Expand Down
4 changes: 2 additions & 2 deletions launch_dev_docker
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pwd=$(pwd)
cd $thisdir

echo "building with logs in /tmp/launch_dev.log ..."
docker build -t dev_u22 ${thisdir}/.devcontainer > /tmp/launch_dev.log
docker build -t dev-e7 ${thisdir}/.devcontainer > /tmp/launch_dev.log
echo "build complete."

export MYHOME=/home/${USER}
Expand All @@ -35,5 +35,5 @@ opts="
"
(
set -x
docker run ${opts} -w ${pwd} --rm ${mounts} -it "$@" dev_u22 bash
docker run ${opts} -w ${pwd} --rm ${mounts} -it "$@" dev-e7 bash
)

0 comments on commit 15b2b46

Please sign in to comment.