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

Provide npcap distribution internally #148

Merged
merged 17 commits into from
Jan 12, 2022
Merged

Provide npcap distribution internally #148

merged 17 commits into from
Jan 12, 2022

Conversation

v1v
Copy link
Member

@v1v v1v commented Jan 11, 2022

What

Provide the npcap distribution in an internal docker image, for such, it uses the internal docker registry, the main docker image and copy the file to /installer folder.

Actions

  • Verifies no security disclosure.
  • Add npcap version in the tag image.

Test

Build

image

image

Push

image

Pull

image

Files

image

@elasticmachine
Copy link

elasticmachine commented Jan 11, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-01-12T17:18:28.941+0000

  • Duration: 133 min 42 sec

  • Commit: 4ff4855

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

Makefile Outdated
Comment on lines 3 to 6
# TODO: to be replaced once we validate it works as expected
# TODO: version to be tagged too.
#NPCAP_FILE=npcap-1.60-oem.exe
NPCAP_FILE=test.txt
Copy link
Member Author

Choose a reason for hiding this comment

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

This will be replaced in a follow up, once we validate everything was pushed as expected

Makefile.common Outdated
push:
echo ">> Pushing $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
@[ "$(SUFFIX)" = "$(SUFFIX_NPCAP_VERSION)" ] \
Copy link
Member Author

Choose a reason for hiding this comment

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

I could not find the way to use ifeq with SUFFIX and SUFFIX_NPCAP_VERSION, even though these values were the same, but the ifeq returned false.

I guess, something should be related to where the SUFFIX is defined and the include function.

Makefile Outdated
Comment on lines 3 to 7
# TODO: to be replaced once we validate it works as expected
# TODO: version to be tagged too.
NPCAP_VERSION=1.60
#NPCAP_FILE=npcap-$(NPCAP_VERSION)-oem.exe
NPCAP_FILE=test.txt
Copy link
Member Author

Choose a reason for hiding this comment

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

TODO: to be replaced once we agree this is the way to go

Suggested change
# TODO: to be replaced once we validate it works as expected
# TODO: version to be tagged too.
NPCAP_VERSION=1.60
#NPCAP_FILE=npcap-$(NPCAP_VERSION)-oem.exe
NPCAP_FILE=test.txt
NPCAP_VERSION=1.60
NPCAP_FILE=npcap-$(NPCAP_VERSION)-oem.exe

@v1v v1v marked this pull request as ready for review January 12, 2022 11:31
@v1v v1v requested a review from a team January 12, 2022 11:31
Otherwise the version was empty

Let's see whether it works
…e specific makefile in the go1.X version folder
Makefile.common Outdated
Comment on lines 7 to 9
# TODO: to be replaced once we validate it works as expected
#NPCAP_FILE := npcap-$(NPCAP_VERSION)-oem.exe
NPCAP_FILE := test.txt
Copy link
Member Author

Choose a reason for hiding this comment

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

Suggested change
# TODO: to be replaced once we validate it works as expected
#NPCAP_FILE := npcap-$(NPCAP_VERSION)-oem.exe
NPCAP_FILE := test.txt
NPCAP_FILE := npcap-$(NPCAP_VERSION)-oem.exe


If you'd like to bump the npcap version please follow the below steps:

1) Update `NPCAP_VERSION` value in the `Makefile`.
Copy link
Member Author

Choose a reason for hiding this comment

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

Suggested change
1) Update `NPCAP_VERSION` value in the `Makefile`.
1) Update `NPCAP_VERSION` value in the `Makefile.common`.

@v1v v1v requested a review from efd6 January 12, 2022 15:39
@v1v v1v self-assigned this Jan 12, 2022
@v1v v1v added the enhancement New feature or request label Jan 12, 2022
@v1v v1v merged commit 2f48257 into main Jan 12, 2022
v1v added a commit that referenced this pull request Jan 20, 2022
@v1v v1v deleted the feature/support-pcap branch January 20, 2022 13:23
@v1v v1v mentioned this pull request Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants