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

Update edge-proxy (1.4.0) and pe-terminanal (1.2.0) #439

Merged
merged 2 commits into from
Aug 19, 2024

Conversation

JanneKiiskila
Copy link
Contributor

Update edge-proxy and pe-terminal (aka edge-terminal) to the latest versions.

This requires then changes to Dockerfile:

Version 27.03 of docker does not seem to take the line 3 and 4 in anymore as previously, it ignores them. This made the build fail

 2 warnings found (use --debug to expand):
 - UndefinedVar: Usage of undefined variable '$http_proxy' (line 19)
 - UndefinedVar: Usage of undefined variable '$https_proxy' (line 20)

We also had one mixed capital usage with FROM and as -> AS needs to be in capital as well.

Install golang 1.20 as it's needed with updated pe-terminal and edge-proxy - they are golang 1.20 based instead of 1.18.

@JanneKiiskila JanneKiiskila self-assigned this Jul 8, 2024
Dockerfile Outdated
Comment on lines 3 to 4
#ARG http_proxy=""
#ARG https_proxy=""
Copy link
Contributor

Choose a reason for hiding this comment

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

Could these be removed instead of commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

This requires then changes to Dockerfile:

Version 27.03 of docker does not seem to take the line 3 and 4 in
anymore as previously, it ignores them. This made the build fail

```
 2 warnings found (use --debug to expand):
 - UndefinedVar: Usage of undefined variable '$http_proxy' (line 19)
 - UndefinedVar: Usage of undefined variable '$https_proxy' (line 20)
```

We also had one mixed capital usage with FROM and as -< AS needs to
be in capital as well.

Install golang 1.20 as it's needed with updated pe-terminal and
edge-proxy - they are golang 1.20 based instead of 1.18.
They are not adding value, the ARG for http proxy is documented
a few lines below them anyway.

Ref: review feedback from Pete.
@JanneKiiskila
Copy link
Contributor Author

Rebased against master and force pushed.

Copy link
Contributor

@petedyerarm petedyerarm left a comment

Choose a reason for hiding this comment

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

LGTM

@JanneKiiskila JanneKiiskila merged commit f2e41ed into master Aug 19, 2024
5 checks passed
@JanneKiiskila JanneKiiskila deleted the update-edge-proxy-and-terminal branch August 19, 2024 16:03
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.

2 participants