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.

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

Opcua IOC #57

Merged
merged 5 commits into from
Apr 24, 2024
Merged

Opcua IOC #57

merged 5 commits into from
Apr 24, 2024

Conversation

guirodrigueslima
Copy link
Contributor

  • Added opca ioc to epics-in-docker
  • The IOC was not build with the install_module() function, as "make clean" removes the envPaths file.

@guirodrigueslima
Copy link
Contributor Author

Added ether_ip IOC to PLCs Rockwell family.

base/install_opcua.sh Outdated Show resolved Hide resolved
base/install_opcua.sh Outdated Show resolved Hide resolved
base/install_opcua.sh Outdated Show resolved Hide resolved
@guirodrigueslima guirodrigueslima force-pushed the opcua branch 2 times, most recently from 690e5e2 to 7de7014 Compare April 12, 2024 13:02
Copy link
Collaborator

@henriquesimoes henriquesimoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides the implementation, I think we can improve the messages by making them more descriptive and explanatory. For instance, why we are using another path for IOCs? Why do we now use another function to install things?

In addition, please let the first letter after the : lowercase and ending with a period (.), so that the message headline is kept in the pattern.

CHANGES.md Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install_iocs.sh Outdated Show resolved Hide resolved
@henriquesimoes
Copy link
Collaborator

Besides the implementation, I think we can improve the messages by making them more descriptive and explanatory.

Sorry. I think I wasn't clear enough here. I'm talking about commit messages specifically. (Same thing for the the lowercase and period thing I said.)

base/install_iocs.sh Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
base/install_iocs.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
base/install-functions.sh Outdated Show resolved Hide resolved
Copy link
Collaborator

@henriquesimoes henriquesimoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My review covers mainly changes to reduce the diff and to better organize the commits.

base/Dockerfile Outdated
@@ -27,6 +28,7 @@ COPY lnls-run.sh /usr/local/bin/lnls-run
ARG EPICS_BASE_VERSION
ENV EPICS_BASE_PATH /opt/epics/base
ENV EPICS_MODULES_PATH /opt/epics/modules
ENV EPICS_IOCS_PATH /opt/epics/iocs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We no longer need this definition, right?

CHANGES.md Outdated
Comment on lines 17 to 18
* base: new functionality for installing iocs. by @guirodrigueslima in
https://github.com/cnpem/epics-in-docker/pull/57
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, you don't need to add this to the changelog. Only the one from commit a0b7476.

base/Dockerfile Show resolved Hide resolved
base/Dockerfile Outdated Show resolved Hide resolved
base/Dockerfile Outdated Show resolved Hide resolved
@@ -29,3 +29,4 @@ services:
PMAC_VERSION: ${PMAC_VERSION}
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}
RETOOLS_VERSION: ${RETOOLS_VERSION}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop this empty line change from this commit.

base/install-functions.sh Outdated Show resolved Hide resolved
base/install_opcua.sh Outdated Show resolved Hide resolved
base/musl/Dockerfile Outdated Show resolved Hide resolved
Copy link
Collaborator

@henriquesimoes henriquesimoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks fine by me. @ericonr, can you finish your review on this for us to merge it?

Highlighted some points that can be fixed when merging. No need for another patch iteration for these.

base/docker-compose.yml Outdated Show resolved Hide resolved
base/docker-compose.yml Outdated Show resolved Hide resolved
base/musl/docker-compose.yml Outdated Show resolved Hide resolved
ericonr and others added 3 commits April 24, 2024 10:02
The modules should be grouped by script which uses them.
This way, the arguments are grouped by which script uses them, and can
explicitly follow the same order of definition used in the .env and
docker-compose.yml files.
This feature was created to add standard iocs to the epics-in-docker
image which can be exported as no-build. It is now possible to pass a
flag (-i) to install_from_github() and install_module() to generate the
envPaths file for the ioc. Since these functions are no longer only
about modules, it was also necessary to change some function names.
@ericonr ericonr force-pushed the opcua branch 2 times, most recently from 40e00b5 to 030afce Compare April 24, 2024 13:47
The module was installed in the modules directory, because there can be
other IOCs that depend on the ether_ip module, even though it ships an
IOC of its own.
A new install script was added for it because it isn't supported for all
our current platforms, due to being prebuilt, and includes extra build
steps for that same reason.

Its install location follows the same reasoning as ether_ip.
@ericonr ericonr merged commit d897611 into main Apr 24, 2024
2 checks passed
@ericonr ericonr deleted the opcua branch April 24, 2024 13:58
@henriquesimoes henriquesimoes linked an issue Apr 24, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add OPC-UA and ether_ip modules
3 participants