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

Jump to bottom

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

Merged
merged 2 commits into from
Aug 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad1100c
Update edge-proxy (1.4.0) and pe-terminanal (1.2.0)
JanneKiiskila Jul 8, 2024
61ac85d
Dockerfile - remove #ARGs
JanneKiiskila Aug 19, 2024
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
ARG RISK=stable
ARG UBUNTU=20.04
ARG http_proxy=""
ARG https_proxy=""
# Based on Docker image at;
# https://raw.githubusercontent.com/snapcore/snapcraft/master/docker/Dockerfile
# Update to focal + merged in what we had originally here.
Expand All @@ -11,13 +9,13 @@ ARG https_proxy=""
# ARG https_proxy="https://<user>:<password>@<proxy-ip>:<proxy-port>"

# Use the proxy from docker build for the container runtime environment as well
FROM ubuntu:$UBUNTU as builder
FROM ubuntu:$UBUNTU AS builder
ARG RISK
ARG UBUNTU
RUN echo "Building snapcraft:$RISK in ubuntu:$UBUNTU"

ENV http_proxy=$http_proxy
ENV https_proxy=$https_proxy
ENV http_proxy=""
ENV https_proxy=""

# Grab dependencies
RUN apt-get update
Expand Down Expand Up @@ -125,6 +123,8 @@ RUN curl -L https://dl.google.com/go/go1.15.15.linux-amd64.tar.gz | tar -xz && \

RUN curl -L https://golang.org/dl/go1.18.10.linux-amd64.tar.gz | tar -xz && \
mv go /usr/local/go1.18
RUN curl -L https://golang.org/dl/go1.20.14.linux-amd64.tar.gz | tar -xz && \
mv go /usr/local/go1.20

# Install the script that sets up the user environment
# and runs CMD as the current user instead of as root
Expand Down
8 changes: 4 additions & 4 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,11 @@ parts:
edge-proxy:
plugin: go
source: https://github.com/PelionIoT/edge-proxy.git
source-tag: v1.3.0
source-tag: v1.4.0
build-environment:
- GOFLAGS: "$GOFLAGS -modcacherw"
override-build: |
export ALT_GO=go1.18
export ALT_GO=go1.20
export ORI_GO=go1.15
export GOROOT=/usr/local/$ALT_GO
export PATH="$GOROOT/bin:$PATH"
Expand All @@ -545,11 +545,11 @@ parts:
pe-terminal:
plugin: go
source: https://github.com/PelionIoT/pe-terminal.git
source-tag: v1.1.0
source-tag: v1.2.0
build-environment:
- GOFLAGS: "$GOFLAGS -modcacherw"
override-build: |
export ALT_GO=go1.18
export ALT_GO=go1.20
export ORI_GO=go1.15
export GOROOT=/usr/local/$ALT_GO
export PATH="$GOROOT/bin:$PATH"
Expand Down