Skip to content

Commit

Permalink
add sequencer in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 5, 2024
1 parent bb83bdd commit 4a065fc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dockerfile": "../Dockerfile",
"target": "developer",
"args": {
"TARGET_ARCHITECTURE": "linux"
"TARGET_ARCHITECTURE": "rtems"
}
},
"remoteEnv": {
Expand Down
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##### build stage ##############################################################

ARG TARGET_ARCHITECTURE
ARG BASE=7.0.8ec1b1
ARG BASE=7.0.8ec1b3
ARG REGISTRY=ghcr.io/epics-containers

FROM ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer
Expand All @@ -21,17 +21,23 @@ WORKDIR ${SOURCE_FOLDER}/ibek-support
# copy the global ibek files
COPY ibek-support/_global/ _global

COPY ibek-support/sequencer sequencer
RUN sequencer/install.sh R2-2-9

COPY ibek-support/iocStats/ iocStats
RUN iocStats/install.sh 3.2.0

COPY ibek-support/asyn/ asyn/
RUN asyn/install.sh R4-42
RUN asyn/install.sh R4-44-2

COPY ibek-support/autosave/ autosave/
RUN autosave/install.sh R5-11

COPY ibek-support/busy/ busy/
RUN busy/install.sh R1-7-3
RUN busy/install.sh R1-7-4

COPY ibek-support/sscan/ sscan/
RUN sscan/install.sh R2-11-6

COPY ibek-support/calc/ calc/
RUN calc/install.sh R3-7-5
Expand Down
8 changes: 4 additions & 4 deletions build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

################################################################################
# generic local build script for epics-containers ioc repositories #
# generic local build script for epics-containers repositories #
################################################################################

# set TARGET_ARCHITECTURE to rtems for RTEMS based targets
Expand All @@ -11,7 +11,7 @@ TARGET=${TARGET:-developer}
# set TAG to override the default tag
TAG=${TAG:-ec_test}

# log commands and stop on erros
# log commands and stop on errors
set -xe

cd $(dirname ${0})
Expand All @@ -24,5 +24,5 @@ if $docker buildx version &>/dev/null; then builx=buildx; load=--load; fi
if [ ! -d ibek-support ] ; then git submodule update --init ; fi

# build and developer images
$docker build -t ${TAG} --build-arg TARGET_ARCHITECTURE=$T_A $load --target $TARGET .

$docker build $buildx -t ${TAG} --build-arg \
TARGET_ARCHITECTURE=$T_A $load --target $TARGET .

0 comments on commit 4a065fc

Please sign in to comment.