diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ffdaf93df..00822752c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,7 +29,7 @@ jobs: # Dockerize - name: Build docker images run: | - docker-compose build + docker compose build - name: Login to Docker Hub uses: docker/login-action@v3 @@ -44,13 +44,13 @@ jobs: export DOCKER_TAG=`git describe --tags --always` # Tag all images for upload to the registry - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:latest - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:latest + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} # Upload to docker registry - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:latest - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} echo ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} pushed + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:latest + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} echo ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} pushed wheel: name: build and deploy to PyPI diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index e10a27ae7..71ba69f19 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -31,7 +31,7 @@ jobs: # Dockerize - name: Build docker images run: | - docker-compose build + docker compose build - name: Login to Docker Hub uses: docker/login-action@v3 @@ -47,11 +47,11 @@ jobs: echo "${DOCKER_TAG}" # Tag all images for upload to the registry - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} # Upload to docker registry - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} - docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} echo ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} pushed + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} + docker compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} echo ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} pushed # testing so we can catch any issues before release # if issues are found, test locally, or copy to pytest.yml for test on push diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index b157c9b16..64b1efef4 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -53,7 +53,7 @@ jobs: - name: Build docker test images run: | - docker-compose build socs + docker compose build socs # Integration Tests - name: Run integration tests diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 431c8814e..f8f0b4d92 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -26,4 +26,4 @@ jobs: # Dockerize - name: Build docker images run: | - docker-compose build + docker compose build diff --git a/docs/agents/acti_camera.rst b/docs/agents/acti_camera.rst index 7cb4b1732..37cb452bf 100644 --- a/docs/agents/acti_camera.rst +++ b/docs/agents/acti_camera.rst @@ -48,7 +48,7 @@ Docker Compose `````````````` The iBootbar Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-cameras: image: simonsobs/socs:latest diff --git a/docs/agents/bluefors_agent.rst b/docs/agents/bluefors_agent.rst index ccfa79329..fa486323a 100644 --- a/docs/agents/bluefors_agent.rst +++ b/docs/agents/bluefors_agent.rst @@ -38,7 +38,7 @@ An example configuration for your ocs config file:: Docker Compose `````````````` -Example docker-compose configuration:: +Example docker compose configuration:: ocs-bluefors: image: simonsobs/socs:latest @@ -145,7 +145,7 @@ tools, i.e. Docker for Windows, if possible) is: - Run docker terminal (this performs some Virtualbox setup) - Run docker login - Clone the ocs-site-configs repo and create a directory for your machine -- Configure ocs/docker-compose files +- Configure ocs/docker compose files - Make sure your system clock is set to UTC - Bring up the container(s) diff --git a/docs/agents/cryomech_cpa.rst b/docs/agents/cryomech_cpa.rst index 43e0404a5..3af58368a 100644 --- a/docs/agents/cryomech_cpa.rst +++ b/docs/agents/cryomech_cpa.rst @@ -47,7 +47,7 @@ Docker Compose `````````````` The Cryomech CPA Agent should be configured to run in a Docker container. -An example docker-compose service configuration is shown here:: +An example docker compose service configuration is shown here:: ocs-ptc1: image: simonsobs/socs:latest diff --git a/docs/agents/generator.rst b/docs/agents/generator.rst index 69ec2630d..cbd07adc6 100644 --- a/docs/agents/generator.rst +++ b/docs/agents/generator.rst @@ -45,7 +45,7 @@ Docker Compose `````````````` The Generator Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-generator: image: simonsobs/socs:latest diff --git a/docs/agents/hi6200.rst b/docs/agents/hi6200.rst index 75c74ad19..98f3d58e7 100644 --- a/docs/agents/hi6200.rst +++ b/docs/agents/hi6200.rst @@ -44,7 +44,7 @@ Docker Compose `````````````` The SCPI PSU Agent should be configured to run in a Docker container. -An example docker-compose service configuration is shown here:: +An example docker compose service configuration is shown here:: ocs-hi6200: image: simonsobs/socs:latest diff --git a/docs/agents/hwp_encoder.rst b/docs/agents/hwp_encoder.rst index 19a3f9ea1..5f09ed2a0 100644 --- a/docs/agents/hwp_encoder.rst +++ b/docs/agents/hwp_encoder.rst @@ -49,7 +49,7 @@ Docker Compose `````````````` The CHWP BBB agent can be run via a Docker container. The following is an -example of what to insert into your institution's docker-compose file. +example of what to insert into your institution's docker compose file. This again is an example to run multiple agents:: ocs-hwpbbb-agent-HBA0: diff --git a/docs/agents/hwp_gripper.rst b/docs/agents/hwp_gripper.rst index 371fd7b20..d239c52a7 100644 --- a/docs/agents/hwp_gripper.rst +++ b/docs/agents/hwp_gripper.rst @@ -39,7 +39,7 @@ An example site-config-file block:: Docker Compose ````````````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-hwp-gripper: image: simonsobs/socs:latest diff --git a/docs/agents/hwp_picoscope.rst b/docs/agents/hwp_picoscope.rst index 72b33e775..012139bf1 100644 --- a/docs/agents/hwp_picoscope.rst +++ b/docs/agents/hwp_picoscope.rst @@ -55,7 +55,7 @@ Docker yourself. A Dockerfile is provided in ``socs/docker/hwp_picoscope/``. The HWP picoscope agent can be run via a Docker container. The following is an -example of what to insert into your institution's docker-compose file:: +example of what to insert into your institution's docker compose file:: picoscope: image: ocs-hwp-picoscope-agent:latest diff --git a/docs/agents/hwp_pid.rst b/docs/agents/hwp_pid.rst index 2743c01f2..8b0193fa6 100644 --- a/docs/agents/hwp_pid.rst +++ b/docs/agents/hwp_pid.rst @@ -30,7 +30,7 @@ An example site-config-file block:: Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-hwp-pid: image: simonsobs/socs:latest diff --git a/docs/agents/hwp_pmx.rst b/docs/agents/hwp_pmx.rst index a72402bea..7ba0630d2 100644 --- a/docs/agents/hwp_pmx.rst +++ b/docs/agents/hwp_pmx.rst @@ -32,7 +32,7 @@ An example site-config-file block:: Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-hwp-pmx: image: simonsobs/socs:latest diff --git a/docs/agents/ibootbar.rst b/docs/agents/ibootbar.rst index 775a737f4..4e3cddaf2 100644 --- a/docs/agents/ibootbar.rst +++ b/docs/agents/ibootbar.rst @@ -41,7 +41,7 @@ Docker Compose `````````````` The iBootbar Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-ibootbar: image: simonsobs/socs:latest diff --git a/docs/agents/ifm_sbn246_flowmeter.rst b/docs/agents/ifm_sbn246_flowmeter.rst index b6feb97ff..3265fec2c 100644 --- a/docs/agents/ifm_sbn246_flowmeter.rst +++ b/docs/agents/ifm_sbn246_flowmeter.rst @@ -43,7 +43,7 @@ Docker Compose `````````````` The IFM SBN246 Flowmeter Agent should be configured to run in a Docker -container. An example docker-compose service configuration is shown here:: +container. An example docker compose service configuration is shown here:: ocs-flow: image: simonsobs/socs:latest diff --git a/docs/agents/labjack.rst b/docs/agents/labjack.rst index 946de83f1..f9f1c343b 100644 --- a/docs/agents/labjack.rst +++ b/docs/agents/labjack.rst @@ -102,7 +102,7 @@ Docker Compose `````````````` The LabJack Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-labjack: image: simonsobs/socs:latest diff --git a/docs/agents/lakeshore425.rst b/docs/agents/lakeshore425.rst index 8c55a3a0f..b61902545 100644 --- a/docs/agents/lakeshore425.rst +++ b/docs/agents/lakeshore425.rst @@ -38,7 +38,7 @@ If you would like to chanege the setting or check the status of the lakeshore 42 Docker Compose `````````````` The ocs-lakeshore425-agent can be run via a Docker container. The following is an -example of what to insert into your institution's docker-compose file.:: +example of what to insert into your institution's docker compose file.:: ocs-lakeshore425-agent: image: simonsobs/socs:latest diff --git a/docs/agents/magpie.rst b/docs/agents/magpie.rst index 677574048..dd264ab04 100644 --- a/docs/agents/magpie.rst +++ b/docs/agents/magpie.rst @@ -22,7 +22,7 @@ frame is received. Configuration File Examples ------------------------------ -Below are example docker-compose and ocs configuration files for running the +Below are example docker compose and ocs configuration files for running the magpie agent. OCS Site Config @@ -67,7 +67,7 @@ fake data by adding the ``--fake-data`` argument. Docker Compose `````````````````` -Below is an example docker-compose entry for running a magpie corresponding to +Below is an example docker compose entry for running a magpie corresponding to crate-id 1 and slot 2. If crossbar is being run on a different server, you'll have to modify the ``site-hub`` and ``site-http`` args accordingly:: diff --git a/docs/agents/meinberg_m1000_agent.rst b/docs/agents/meinberg_m1000_agent.rst index 63d0cc54e..2757cc447 100644 --- a/docs/agents/meinberg_m1000_agent.rst +++ b/docs/agents/meinberg_m1000_agent.rst @@ -72,7 +72,7 @@ Docker Compose `````````````` The Meinberg M1000 Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-m1000: image: simonsobs/socs:latest diff --git a/docs/agents/meinberg_syncbox_agent.rst b/docs/agents/meinberg_syncbox_agent.rst index 640f40400..69c31bef9 100644 --- a/docs/agents/meinberg_syncbox_agent.rst +++ b/docs/agents/meinberg_syncbox_agent.rst @@ -43,7 +43,7 @@ Docker Compose `````````````` The Meinberg Syncbox Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-timing-syncbox: image: simonsobs/socs:latest diff --git a/docs/agents/pfeiffer.rst b/docs/agents/pfeiffer.rst index 00f26c843..27ff2370b 100644 --- a/docs/agents/pfeiffer.rst +++ b/docs/agents/pfeiffer.rst @@ -44,7 +44,7 @@ Docker Compose `````````````` The Pfeiffer Agent can be run via a Docker container. The following is an -example of what to insest into your institution's docker-compose file. :: +example of what to insest into your institution's docker compose file. :: ocs-pfeiffer: diff --git a/docs/agents/pfeiffer_tc400.rst b/docs/agents/pfeiffer_tc400.rst index 3b889940d..73016e36f 100644 --- a/docs/agents/pfeiffer_tc400.rst +++ b/docs/agents/pfeiffer_tc400.rst @@ -54,7 +54,7 @@ block using all of the available arguments:: Docker Compose `````````````` The agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-pfeiffer-turboA: image: simonsobs/socs:latest diff --git a/docs/agents/pysmurf-controller.rst b/docs/agents/pysmurf-controller.rst index d0bbbc864..52b8c7b38 100644 --- a/docs/agents/pysmurf-controller.rst +++ b/docs/agents/pysmurf-controller.rst @@ -64,7 +64,7 @@ mount in a development copy of SODETLIB so that we have the most recent version without having to rebuild this container. -The docker-compose for the pysmurf-controller that publishes to a container +The docker compose for the pysmurf-controller that publishes to a container named ``ocs-pysmurf-monitor`` might look something like:: ocs-pysmurf: diff --git a/docs/agents/pysmurf-monitor.rst b/docs/agents/pysmurf-monitor.rst index 291a90fee..2ee55b3ea 100644 --- a/docs/agents/pysmurf-monitor.rst +++ b/docs/agents/pysmurf-monitor.rst @@ -31,7 +31,7 @@ Example site-config entry:: Docker Compose ```````````````` -An example docker-compose entry might look like:: +An example docker compose entry might look like:: ocs-pysmurf-monitor: image: simonsobs/socs:latest @@ -48,7 +48,7 @@ An example docker-compose entry might look like:: - /data:/data Where SOCS_TAG and CB_HOST are set in the ``.env`` file in the same dir as the -docker-compose file. +docker compose file. Description ----------- diff --git a/docs/agents/scpi_psu.rst b/docs/agents/scpi_psu.rst index 5310e0a0b..9be2fc5c0 100644 --- a/docs/agents/scpi_psu.rst +++ b/docs/agents/scpi_psu.rst @@ -46,7 +46,7 @@ Docker Compose `````````````` The SCPI PSU Agent should be configured to run in a Docker container. -An example docker-compose service configuration is shown here:: +An example docker compose service configuration is shown here:: ocs-psuK: image: simonsobs/socs:latest diff --git a/docs/agents/smurf_crate_monitor.rst b/docs/agents/smurf_crate_monitor.rst index 3c3f334e5..d6e2d4e32 100644 --- a/docs/agents/smurf_crate_monitor.rst +++ b/docs/agents/smurf_crate_monitor.rst @@ -55,7 +55,7 @@ steps: 4. Copy ocs-user ssh key using 'ssh-copy-id' You also need to add the ocs-base anchor and mount the home directory of -the ocs-user in your 'docker-compose' file, see below for an example. +the ocs-user in your 'docker compose' file, see below for an example. The second argument, 'crate-id', is just an identifier for your feed names to distinguish between identical sensors on different crates. @@ -64,7 +64,7 @@ Docker Compose `````````````` The SMuRF Crate Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-smurf-crate-monitor: <<: *ocs-base diff --git a/docs/agents/smurf_timing_card.rst b/docs/agents/smurf_timing_card.rst index e313d91bc..1cea92151 100644 --- a/docs/agents/smurf_timing_card.rst +++ b/docs/agents/smurf_timing_card.rst @@ -16,7 +16,7 @@ timing software. Configuration File Examples ------------------------------ Below are configuration examples for the ocs config file and for the -docker-compose service. +docker compose service. OCS Site Config ````````````````` @@ -36,7 +36,7 @@ False by default. Docker Compose ```````````````` -Below is an example of the docker-compose service for the timing card agent:: +Below is an example of the docker compose service for the timing card agent:: ocs-smurf-timing-card: image: simonsobs/socs:latest diff --git a/docs/agents/suprsync.rst b/docs/agents/suprsync.rst index 8a88c1f52..4150ba40c 100644 --- a/docs/agents/suprsync.rst +++ b/docs/agents/suprsync.rst @@ -71,7 +71,7 @@ transferred files after 7 days, or 604800 seconds:: Docker Compose `````````````` -Below is a sample docker-compose entry for the SupRsync agents. +Below is a sample docker compose entry for the SupRsync agents. Because the data we'll be transfering is owned by the ``cryo:smurf`` user, we set that as the user of the agent so it has the correct permissions. This is only possible because the ``cryo:smurf`` user is already built into the diff --git a/docs/agents/synacc.rst b/docs/agents/synacc.rst index dfd3d904c..455acf66e 100644 --- a/docs/agents/synacc.rst +++ b/docs/agents/synacc.rst @@ -39,7 +39,7 @@ Docker Compose `````````````` The Synaccess Agent should be configured to run in a Docker container. -An example docker-compose service configuration is shown here:: +An example docker compose service configuration is shown here:: ocs-synacc: image: simonsobs/socs:latest diff --git a/docs/agents/tektronix3021c.rst b/docs/agents/tektronix3021c.rst index 635d475ad..c5f47bbd6 100644 --- a/docs/agents/tektronix3021c.rst +++ b/docs/agents/tektronix3021c.rst @@ -45,7 +45,7 @@ Docker Compose `````````````` The Tektronix AWG Agent should be configured to run in a Docker container. -An example docker-compose service configuration is shown here:: +An example docker compose service configuration is shown here:: ocs-psuK: image: simonsobs/socs:latest diff --git a/docs/agents/ucsc_radiometer.rst b/docs/agents/ucsc_radiometer.rst index 6ae3e4329..2aecb41ee 100644 --- a/docs/agents/ucsc_radiometer.rst +++ b/docs/agents/ucsc_radiometer.rst @@ -47,7 +47,7 @@ Docker Compose `````````````` The UCSC Radiometer Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-ucsc-radiometer: image: simonsobs/socs:latest diff --git a/docs/agents/ups.rst b/docs/agents/ups.rst index 6d17932ab..4d2862b99 100644 --- a/docs/agents/ups.rst +++ b/docs/agents/ups.rst @@ -43,7 +43,7 @@ Docker Compose `````````````` The UPS Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-ups: image: simonsobs/socs:latest diff --git a/docs/agents/vantage_pro2.rst b/docs/agents/vantage_pro2.rst index 40170fe9e..776d20b8c 100644 --- a/docs/agents/vantage_pro2.rst +++ b/docs/agents/vantage_pro2.rst @@ -59,7 +59,7 @@ Docker Compose `````````````` The Vantage Pro2 Agent should be configured to run in a Docker container. An -example docker-compose service configuration is shown here:: +example docker compose service configuration is shown here:: ocs-vantage-pro2: image: simonsobs/socs:latest diff --git a/docs/agents/wiregrid_actuator.rst b/docs/agents/wiregrid_actuator.rst index 280b2b2e4..4c5324c3a 100644 --- a/docs/agents/wiregrid_actuator.rst +++ b/docs/agents/wiregrid_actuator.rst @@ -47,7 +47,7 @@ An example site-config-file block:: Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-wgactuator-agent: image: simonsobs/ocs-wgactuator-agent:latest diff --git a/docs/agents/wiregrid_encoder.rst b/docs/agents/wiregrid_encoder.rst index 4424c6dcd..761b7c788 100644 --- a/docs/agents/wiregrid_encoder.rst +++ b/docs/agents/wiregrid_encoder.rst @@ -48,7 +48,7 @@ The port number is determined in the script running in the BeagleBoneBlack. Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-wgencoder-agent: image: simonsobs/socs:latest diff --git a/docs/agents/wiregrid_kikusui.rst b/docs/agents/wiregrid_kikusui.rst index 5dd7b3de6..e32d1d042 100644 --- a/docs/agents/wiregrid_kikusui.rst +++ b/docs/agents/wiregrid_kikusui.rst @@ -46,7 +46,7 @@ An example site-config-file block:: Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-wgkikusui-agent: image: simonsobs/socs:latest diff --git a/docs/agents/wiregrid_tiltsensor.rst b/docs/agents/wiregrid_tiltsensor.rst index 23f0a0baa..ecfb9837c 100644 --- a/docs/agents/wiregrid_tiltsensor.rst +++ b/docs/agents/wiregrid_tiltsensor.rst @@ -49,7 +49,7 @@ An example site-config-file block:: Docker Compose `````````````` -An example docker-compose configuration:: +An example docker compose configuration:: ocs-wg-tilt-sensor-agent: image: simonsobs/socs:latest diff --git a/docs/simulators/ls240_simulator.rst b/docs/simulators/ls240_simulator.rst index 92cd55c3f..068fcea27 100644 --- a/docs/simulators/ls240_simulator.rst +++ b/docs/simulators/ls240_simulator.rst @@ -42,7 +42,7 @@ Lakeshore240Agent. This address must match the container name for the simulator: Docker `````` The simulator should be configured to run in a Docker container. An example -docker-compose service configuration is shown here:: +docker compose service configuration is shown here:: ls240-sim: image: simonsobs/ocs-lakeshore240-simulator:latest diff --git a/docs/simulators/ls372_simulator.rst b/docs/simulators/ls372_simulator.rst index 5178b3307..f62eac255 100644 --- a/docs/simulators/ls372_simulator.rst +++ b/docs/simulators/ls372_simulator.rst @@ -38,7 +38,7 @@ selected port. Docker `````` The simulator can be configured to run in a Docker container. An example -docker-compose service configuration is shown here:: +docker compose service configuration is shown here:: ocs-LS372-sim: image: ocs-lakeshore372-simulator diff --git a/docs/simulators/smurf_stream_simulator.rst b/docs/simulators/smurf_stream_simulator.rst index cc908d024..dce62cd9c 100644 --- a/docs/simulators/smurf_stream_simulator.rst +++ b/docs/simulators/smurf_stream_simulator.rst @@ -38,7 +38,7 @@ using all of the available arguments:: Docker `````` The simulator should be configured to run in a Docker container. An example -docker-compose service configuration is shown here:: +docker compose service configuration is shown here:: smurf-stream-sim: image: simonsobs/socs:latest diff --git a/docs/user/sequencer.rst b/docs/user/sequencer.rst index 94eb5a099..77009d0a4 100644 --- a/docs/user/sequencer.rst +++ b/docs/user/sequencer.rst @@ -137,7 +137,7 @@ that config is: The entire point of the tool is remote code execution, making it dangerous if exposed to the open internet. -Once you bring these containers up (with ``docker-compose up -d``), you should +Once you bring these containers up (with ``docker compose up -d``), you should be able to access the Sequencer by pointing your web browser to http://localhost/nextline/. diff --git a/docs/user/webserver.rst b/docs/user/webserver.rst index 4b4066dac..7c6981f25 100644 --- a/docs/user/webserver.rst +++ b/docs/user/webserver.rst @@ -16,11 +16,11 @@ nginx nginx is a lightweight, open source, web server which we will use as a reverse proxy. -docker-compose Configuration +Docker Compose Configuration ---------------------------- We will setup nginx in a docker container. First, ensure you do not currently have a web server running (we need to make sure port 80 is available.) Then add -nginx to your docker-compose file:: +nginx to your docker compose file:: web: image: nginx @@ -105,7 +105,7 @@ htaccesstools.com_. It will look something like this:: Once you have created these two files you can bring up the webserver with:: - $ sudo docker-compose up -d + $ sudo docker compose up -d Your webserver should now be accessible via the configured domain, or through `http://localhost `_. @@ -114,7 +114,7 @@ Grafana Proxy ------------- If you are proxying Grafana and accessing it externally (i.e. not on ``localhost``), then you need to configure several additional environment -variables. In your docker-compose configuration file add:: +variables. In your docker compose configuration file add:: environment: - GF_SERVER_ROOT_URL=http://{{ domain }}/grafana diff --git a/socs/agents/ups/agent.py b/socs/agents/ups/agent.py index 27539c542..8d862b9a5 100644 --- a/socs/agents/ups/agent.py +++ b/socs/agents/ups/agent.py @@ -437,7 +437,7 @@ def acq(self, session, params=None): break # Exit agent to release memory - # Add "restart: unless-stopped" to docker-compose to automatically restart container + # Add "restart: unless-stopped" to docker compose to automatically restart container if ((not params['test_mode']) and (timeout != 0) and (self.is_streaming)): self.log.info(f"{self.restart} minutes have elasped. Exiting agent.") os.kill(os.getppid(), signal.SIGTERM) diff --git a/tests/integration/util.py b/tests/integration/util.py index b5f13f486..db65ce775 100644 --- a/tests/integration/util.py +++ b/tests/integration/util.py @@ -14,7 +14,7 @@ def create_crossbar_fixture(): # def wait_for_crossbar(function_scoped_container_getter): @pytest.fixture(scope="session") def wait_for_crossbar(docker_services): - """Wait for the crossbar server from docker-compose to become + """Wait for the crossbar server from docker compose to become responsive. """