Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

base: update AREA_DETECTOR version. #53

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

base: update AREA_DETECTOR version. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG DEBIAN_VERSION

FROM debian:${DEBIAN_VERSION}

Check warning on line 3 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Default value for global ARG results in an empty or invalid base image name 

InvalidDefaultArgInFrom: Default value for ARG debian:${DEBIAN_VERSION} results in empty or invalid base image name
More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

ARG JOBS

ENV DEBIAN_FRONTEND noninteractive

Check warning on line 7 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# Disable APT sandbox so that single UID restriction is satisfied in systems
# without subuid and subgid configured.
Expand Down Expand Up @@ -37,14 +37,14 @@
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
COPY lnls-run.sh /usr/local/bin/lnls-run

ENV EPICS_IN_DOCKER /opt/epics-in-docker

Check warning on line 40 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
RUN mkdir $EPICS_IN_DOCKER

COPY install-functions.sh $EPICS_IN_DOCKER

ENV EPICS_BASE_PATH /opt/epics/base

Check warning on line 45 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV EPICS_MODULES_PATH /opt/epics/modules

Check warning on line 46 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE

Check warning on line 47 in base/Dockerfile

View workflow job for this annotation

GitHub Actions / build_and_push (base, lnls-debian-epics-7)

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

WORKDIR /opt/epics

Expand All @@ -58,7 +58,6 @@
COPY modules_versions.sh install_modules.sh $EPICS_IN_DOCKER
RUN NEEDS_TIRPC=YES $EPICS_IN_DOCKER/install_modules.sh

COPY backport-adsupport-nanohttp.patch $EPICS_IN_DOCKER
COPY area_detector_versions.sh install_area_detector.sh $EPICS_IN_DOCKER
RUN $EPICS_IN_DOCKER/install_area_detector.sh

Expand Down
2 changes: 1 addition & 1 deletion base/area_detector_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AREA_DETECTOR_VERSION=R3-12-1
AREA_DETECTOR_VERSION=R3-14
NDSSCPIMEGA_VERSION=1.0.0
LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
40 changes: 0 additions & 40 deletions base/backport-adsupport-nanohttp.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions base/install_area_detector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ ARAVIS_INCLUDE=$(pkg-config --cflags-only-I aravis-0.8 | sed -e "s|-I||g")

cd -

patch -d ADSupport -Np1 < ${EPICS_IN_DOCKER}/backport-adsupport-nanohttp.patch

make -j${JOBS}
make clean

Expand Down
Loading