Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: esrrhs/pingtunnel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b79b2ac
Choose a base ref
...
head repository: esrrhs/pingtunnel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0142aa4
Choose a head ref
  • 19 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 29, 2023

  1. update

    esrrhs committed Nov 29, 2023
    Copy the full SHA
    dc93b2d View commit details

Commits on Mar 13, 2024

  1. Bump google.golang.org/protobuf from 1.31.0 to 1.33.0

    Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0.
    
    ---
    updated-dependencies:
    - dependency-name: google.golang.org/protobuf
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 13, 2024
    Copy the full SHA
    9e2a24d View commit details

Commits on Mar 14, 2024

  1. Merge pull request #61 from esrrhs/dependabot/go_modules/google.golan…

    …g.org/protobuf-1.33.0
    
    Bump google.golang.org/protobuf from 1.31.0 to 1.33.0
    esrrhs authored Mar 14, 2024
    Copy the full SHA
    48f286b View commit details

Commits on Apr 19, 2024

  1. Bump golang.org/x/net from 0.19.0 to 0.23.0

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.19.0 to 0.23.0.
    - [Commits](golang/net@v0.19.0...v0.23.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 19, 2024
    Copy the full SHA
    032c377 View commit details

Commits on Apr 20, 2024

  1. Merge pull request #62 from esrrhs/dependabot/go_modules/golang.org/x…

    …/net-0.23.0
    
    Bump golang.org/x/net from 0.19.0 to 0.23.0
    esrrhs authored Apr 20, 2024
    Copy the full SHA
    dec7683 View commit details

Commits on Aug 14, 2024

  1. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    08d4a04 View commit details
  2. Merge pull request #63 from esrrhs/esrrhs-patch-1

    Update Dockerfile
    esrrhs authored Aug 14, 2024
    Copy the full SHA
    bd10560 View commit details
  3. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    3c6d378 View commit details
  4. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    9528be7 View commit details
  5. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    8359f00 View commit details
  6. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    cd5e5ac View commit details
  7. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    ff49e48 View commit details
  8. Merge pull request #64 from esrrhs/esrrhs-patch-1

    Update Dockerfile
    esrrhs authored Aug 14, 2024
    Copy the full SHA
    c0d95e7 View commit details
  9. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    5ff18e2 View commit details
  10. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    a8eadb1 View commit details
  11. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    6e69427 View commit details
  12. Merge pull request #65 from esrrhs/esrrhs-patch-1

    Update Dockerfile
    esrrhs authored Aug 14, 2024
    Copy the full SHA
    d303252 View commit details
  13. Update Dockerfile

    esrrhs authored Aug 14, 2024
    Copy the full SHA
    00d09c2 View commit details
  14. Merge pull request #66 from esrrhs/esrrhs-patch-1

    Update Dockerfile
    esrrhs authored Aug 14, 2024
    Copy the full SHA
    0142aa4 View commit details
Showing with 15 additions and 12 deletions.
  1. +2 −1 Dockerfile
  2. +3 −3 go.mod
  3. +6 −6 go.sum
  4. +4 −2 pack.sh
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@ WORKDIR /app
COPY go.* ./
RUN go mod download
COPY . ./
RUN go build -v -o pingtunnel
RUN go mod tidy
RUN cd cmd && go build -v -o pingtunnel && mv pingtunnel ../

FROM debian
COPY --from=build-env /app/pingtunnel .
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@ go 1.21
require (
github.com/esrrhs/gohome v0.0.0-20231129030235-4e6f13493d6c
github.com/golang/protobuf v1.5.3
golang.org/x/net v0.19.0
golang.org/x/net v0.23.0
)

require (
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/oschwald/geoip2-golang v1.9.0 // indirect
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
golang.org/x/sys v0.15.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/sys v0.18.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -19,15 +19,15 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
6 changes: 4 additions & 2 deletions pack.sh
Original file line number Diff line number Diff line change
@@ -34,15 +34,17 @@ for line in $build_list; do
exit 1
fi
if [ $os = "windows" ]; then
zip ${NAME}_"${os}"_"${arch}"".zip" cmd.exe
mv cmd.exe ${NAME}.exe
zip ${NAME}_"${os}"_"${arch}"".zip" ${NAME}.exe
if [ $? -ne 0 ]; then
echo "os="$os" arch="$arch" zip fail"
exit 1
fi
mv ${NAME}_"${os}"_"${arch}"".zip" pack/
rm $NAME".exe" -f
else
zip ${NAME}_"${os}"_"${arch}"".zip" cmd
mv cmd ${NAME}
zip ${NAME}_"${os}"_"${arch}"".zip" ${NAME}
if [ $? -ne 0 ]; then
echo "os="$os" arch="$arch" zip fail"
exit 1