From 12a7dc905186980eacbe8e13c6ed14eb8d191435 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Wed, 6 Mar 2024 07:48:14 +0000 Subject: [PATCH 1/3] fix pvi entries --- ibek-support | 2 +- user_examples/.bashprofile_dev_container | 15 ------------- user_examples/.bashrc_dev_container | 28 ------------------------ user_examples/README.md | 13 ----------- 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 user_examples/.bashprofile_dev_container delete mode 100644 user_examples/.bashrc_dev_container delete mode 100644 user_examples/README.md diff --git a/ibek-support b/ibek-support index b8a2a35..f40c3b9 160000 --- a/ibek-support +++ b/ibek-support @@ -1 +1 @@ -Subproject commit b8a2a350a84f853af4a52157329be02044fbf8a6 +Subproject commit f40c3b9d20beebdebaed0baefe542a18b398475d diff --git a/user_examples/.bashprofile_dev_container b/user_examples/.bashprofile_dev_container deleted file mode 100644 index e5af527..0000000 --- a/user_examples/.bashprofile_dev_container +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -################################################################################ -# Custom profile for epics-containers devcontainer # -# # -# This will run inside the devcontainer after creation # -################################################################################ - -# apt-get update -# apt-get -y --no-install-recommends install vimdiff -# apt-get install what you like - -# add command line completion to the ibek tool -ibek --install-completion bash - diff --git a/user_examples/.bashrc_dev_container b/user_examples/.bashrc_dev_container deleted file mode 100644 index 0ca306a..0000000 --- a/user_examples/.bashrc_dev_container +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -################################################################################ -###### This is sourced by all terminals epics-containers IOC devcontainer ###### -###### personal .bashrc_dev for setting up environment in devcontainers ###### -################################################################################ - -export LS_OPTIONS='--color=auto' -eval "$(dircolors)" 2> /dev/null -alias ls='ls $LS_OPTIONS' -alias ll='ls $LS_OPTIONS -l' -alias l='ls $LS_OPTIONS -lA' - -# Save all history forever -# Add these to your user's .bashrc to keep a single history inside and out of containers -export HISTCONTROL=ignoreboth:erasedups # Remove adjacent duplicate entries -export HISTSIZE= # Unlimited history -export HISTFILESIZE= # Unlimited history -# Use a unique bash history file so it doesn't get manually trucated by applications -export HISTFILE=${HOME}/.bash_eternal_history -shopt -s histappend # Append to history, don't overwrite it -export PROMPT_COMMAND='history -a' - -# add git completion -if [[ ! -f /tmp/git-completion.bash ]]; then - wget -q -P /tmp https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -fi -source /tmp/git-completion.bash diff --git a/user_examples/README.md b/user_examples/README.md deleted file mode 100644 index 94bc520..0000000 --- a/user_examples/README.md +++ /dev/null @@ -1,13 +0,0 @@ -User Customization Examples -=========================== - -Users can customize their epics-containers developer containers by copying -the files in this folder into their home directory and customizing them as -required. - -epics-containers .devcontainer configuration will automatically pick up -these files from the home directory. - -- .bashrc_dev_container: runs on start of every new shell in the container. -- /bashprofile_dev_container: runs once immediately after the creation - of a devcontainer. \ No newline at end of file From 3deaf79d351d9f5915e3b5e0b5cb297434fea05c Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Wed, 6 Mar 2024 07:49:51 +0000 Subject: [PATCH 2/3] remove rtems --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03fffd7..9804a05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: target: [developer, runtime] - architecture: [linux, rtems] + architecture: [linux] include: - os: ubuntu-latest platforms: linux/amd64 From 5456576a24881582bc55ab14f35ad5bb428d20d2 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Wed, 6 Mar 2024 08:09:20 +0000 Subject: [PATCH 3/3] restore missing library to runtime stage --- Dockerfile | 2 +- ibek-support | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dfe5a31..e383533 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ RUN cd ${IOC} && ./install.sh && make FROM developer AS runtime_prep # get the products from the build stage and reduce to runtime assets only -RUN ibek ioc extract-runtime-assets /assets ${SOURCE_FOLDER}/ibek* +RUN ibek ioc extract-runtime-assets /assets ${SOURCE_FOLDER}/ibek* /usr/local/lib/x86_64-linux-gnu ##### runtime stage ############################################################ diff --git a/ibek-support b/ibek-support index f40c3b9..94849d0 160000 --- a/ibek-support +++ b/ibek-support @@ -1 +1 @@ -Subproject commit f40c3b9d20beebdebaed0baefe542a18b398475d +Subproject commit 94849d043e6abda7f6c9a0a4b4d3a8c349f41556