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 #34 from epics-containers/dev
Browse files Browse the repository at this point in the history
rename to dev-e7
  • Loading branch information
gilesknap authored Jan 3, 2023
2 parents bbf0baf + dc5859e commit 9e3abbb
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ filing a new one. If you have a great idea but it involves big changes, please
file a ticket before making a pull request! We want to make sure you don't spend
your time coding something that might not fit the scope of the project.

.. _GitHub: https://github.com/epics-containers/dev-u22/issues
.. _GitHub: https://github.com/epics-containers/dev-e7/issues

Issue or Discussion?
--------------------
Expand All @@ -16,7 +16,7 @@ Github also offers discussions_ as a place to ask questions and share ideas. If
your issue is open ended and it is not obvious when it can be "closed", please
raise it as a discussion instead.

.. _discussions: https://github.com/epics-containers/dev-u22/discussions
.. _discussions: https://github.com/epics-containers/dev-e7/discussions

Developer guide
---------------
Expand All @@ -25,4 +25,4 @@ The `Developer Guide`_ contains information on setting up a development
environment, running the tests and what standards the code and documentation
should follow.

.. _Developer Guide: https://epics-containers.github.io/dev-u22/main/developer/how-to/contribute.html
.. _Developer Guide: https://epics-containers.github.io/dev-e7/main/developer/how-to/contribute.html
22 changes: 11 additions & 11 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dev-u22
dev-e7
===========================

|code_ci| |docs_ci| |license|

A developer container based on Ubuntu 22.04 LTS.
A developer container based on Ubuntu LTS.

This container provides a complete, portable and customizable development
environment for EPICS and Python projects. Use this container to develop
environment for EPICS and Python projects. Use this container to
work on:

- EPICS Containers: Generic IOCs and Support Modules
Expand All @@ -25,18 +25,18 @@ This project has two companion repositories:


============== ==============================================================
Source code https://github.com/epics-containers/dev-u22
Documentation https://epics-containers.github.io/dev-u22
Releases https://github.com/epics-containers/dev-u22/releases
Source code https://github.com/epics-containers/dev-e7
Documentation https://epics-containers.github.io/dev-e7
Releases https://github.com/epics-containers/dev-e7/releases
============== ==============================================================


.. |code_ci| image:: https://github.com/epics-containers/dev-u22/actions/workflows/code.yml/badge.svg?branch=main
:target: https://github.com/epics-containers/dev-u22/actions/workflows/code.yml
.. |code_ci| image:: https://github.com/epics-containers/dev-e7/actions/workflows/code.yml/badge.svg?branch=main
:target: https://github.com/epics-containers/dev-e7/actions/workflows/code.yml
:alt: Code CI

.. |docs_ci| image:: https://github.com/epics-containers/dev-u22/actions/workflows/docs.yml/badge.svg?branch=main
:target: https://github.com/epics-containers/dev-u22/actions/workflows/docs.yml
.. |docs_ci| image:: https://github.com/epics-containers/dev-e7/actions/workflows/docs.yml/badge.svg?branch=main
:target: https://github.com/epics-containers/dev-e7/actions/workflows/docs.yml
:alt: Docs CI

.. |license| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
Expand All @@ -47,4 +47,4 @@ Releases https://github.com/epics-containers/dev-u22/releases
Anything below this line is used when viewing README.rst and will be replaced
when included in index.rst
See https://epics-containers.github.io/dev-u22 for more detailed documentation.
See https://epics-containers.github.io/dev-e7 for more detailed documentation.
2 changes: 1 addition & 1 deletion demo/docker_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Example docker API client.
This is a demonstrator of the use of the docker API from inside the
devcontainer provided by dev-u22
devcontainer provided by dev-e7
To try this, start the podman_service listening on docker API socket,
install python docker, run this script and then exec a shell in the
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ COPY --from=podman /podman /usr
# systemctl enable --user podman.socket
# systemctl start --user podman.socket
# Plus some podman arguments when launching, i.e.:
# podman run -it -e CONTAINER_HOST=unix:/var/run/docker.sock -v=${XDG_RUNTIME_DIR}/podman/podman.sock:/var/run/docker.sock --security-opt=label=disable ghcr.io/epics-containers/dev-u22:latest
# podman run -it -e CONTAINER_HOST=unix:/var/run/docker.sock -v=${XDG_RUNTIME_DIR}/podman/podman.sock:/var/run/docker.sock --security-opt=label=disable ghcr.io/epics-containers/dev-e7:latest
# This works for docker clients too, as the socket inside is the docker default.
ENV CONTAINER_HOST="unix:/var/run/docker.sock"

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# -- General configuration ------------------------------------------------

# General information about the project.
project = "dev-u22"
project = "dev-e7"

# The full version, including alpha/beta/rc tags.
try:
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/how-to/make-release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ To make a new release, please follow this checklist:
Note that tagging and pushing to the main branch has the same effect except that
you will not get the option to edit the release notes.

.. _release: https://github.com/epics-containers/dev-u22/releases
.. _release: https://github.com/epics-containers/dev-e7/releases
2 changes: 1 addition & 1 deletion docs/developer/tutorials/dev-install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Clone the repository
First clone the repository locally using `Git
<https://git-scm.com/downloads>`_::

git clone git://github.com/epics-containers/dev-u22.git
git clone git://github.com/epics-containers/dev-e7.git

Build the container
-------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ The documentation is split into 2 sections:
:link: user/index
:link-type: doc

The User Guide contains documentation on how to install and use dev-u22.
The User Guide contains documentation on how to install and use dev-e7.

.. grid-item-card:: :material-regular:`code;4em`
:link: developer/index
:link-type: doc

The Developer Guide contains documentation on how to develop and contribute changes back to dev-u22.
The Developer Guide contains documentation on how to develop and contribute changes back to dev-e7.

.. toctree::
:hidden:
Expand Down
2 changes: 1 addition & 1 deletion docs/user/explanations/features.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Features of dev-u22
Features of dev-e7
===================

EPICS Base tools
Expand Down
4 changes: 2 additions & 2 deletions docs/user/tutorials/purpose.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Why to use dev-u22
Why to use dev-e7
------------------

dev-u22 and .devcontainer together provide a portable, customizable
dev-e7 and .devcontainer together provide a portable, customizable
development environment for any project.

Using a container for development means:
Expand Down
2 changes: 1 addition & 1 deletion docs/user/tutorials/workspace.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Create your vscode workspace as follow:

At this point you have a workspace containing a single folder called .devcontainer.
This workspace is open in vscode and vscode is using the developer container
defined in .devcontainer. This devcontainer uses dev-u22 has the base container
defined in .devcontainer. This devcontainer uses dev-e7 has the base container
plus customizations in .devcontainer/Dockerfile. You are free to customize
the developer container by editing files in .devcontainer.

Expand Down
4 changes: 2 additions & 2 deletions launch_dev_podman
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 ..."
podman build -t dev-u22 ${thisdir}/.devcontainer > /tmp/launch_dev.log
podman build -t dev-e7 ${thisdir}/.devcontainer > /tmp/launch_dev.log
echo "build complete."

export MYHOME=/home/${USER}
Expand Down Expand Up @@ -54,4 +54,4 @@ fi
# add your own args by setting podarg environment variable

systemctl --user start podman.socket
podman run ${podarg} ${dls} ${opts} -w ${pwd} --rm ${mounts} -it "$@" dev-u22 bash
podman run ${podarg} ${dls} ${opts} -w ${pwd} --rm ${mounts} -it "$@" dev-e7 bash
2 changes: 1 addition & 1 deletion launch_gui
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ mounts="
-v=${XDG_RUNTIME_DIR}/podman/podman.sock:/var/run/docker.sock
"

podman run ${mounts} ${args} ${x11} dev-u22
podman run ${mounts} ${args} ${x11} dev-e7

0 comments on commit 9e3abbb

Please sign in to comment.