Merge af11e3a19b into bf3eae1d9a

.github/workflows/pre-release.yaml

@@ -1,42 +1,36 @@
 ---
 name: "pre-release"
 
-on: [push]
+on:
-
+  push:
-env:
+    branches:
-  IMAGE_NAME: ${{ github.repository }}
+      - "master"
 
 jobs:
   pre-release-docker:
     name: "Pre Release Docker"
     runs-on: "ubuntu-latest"
-    steps:
-    -
-      name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: ${{ env.IMAGE_NAME }}
-        tags: |
-          type=raw,value=latest,enable={{is_default_branch}}
-          type=sha,format=long
-          type=sha
-          type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
-          type=semver,pattern=v{{major}}.{{minor}}
-          type=semver,pattern=v{{major}}
-          type=ref,event=tag
-          type=ref,event=branch
 
-    - uses: docker/setup-qemu-action@v2
+
-    - uses: docker/setup-buildx-action@v2
+    steps:
-    - uses: docker/login-action@v2
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - uses: docker/setup-qemu-action@v1
+
+    - uses: docker/setup-buildx-action@v1
+
+    - uses: docker/login-action@v1
       with:
         username: "${{ secrets.DOCKER_HUB_USER }}"
         password: "${{ secrets.DOCKER_HUB_TOKEN }}"
+
     - name: "Build and push docker image"
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v2
       with:
+        context: .
+        file: ./Dockerfile
         platforms: linux/amd64,linux/arm/v7,linux/arm64
         push: true
-        tags: ${{ steps.meta.outputs.tags }}
+        tags: "${{ secrets.DOCKER_REPO }}:latest"
-        labels: ${{ steps.meta.outputs.labels }}

bindata/static/js/gotty.js.LICENSE.txt

@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v5.3.2 (https://getbootstrap.com/)
+  * Bootstrap v5.2.0 (https://getbootstrap.com/)
-  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 

bindata/static/js/gotty.licenses.txt

@@ -26,7 +26,8 @@ bootstrap
 MIT
 The MIT License (MIT)
 
-Copyright (c) 2011-2023 The Bootstrap Authors
+Copyright (c) 2011-2022 Twitter, Inc.
+Copyright (c) 2011-2022 The Bootstrap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

js/package.json

@@ -3,29 +3,29 @@
     "version": "1.4.0",
     "private": true,
     "devDependencies": {
-        "@types/bootstrap": "^5.2.10",
+        "@types/bootstrap": "^5.1.9",
         "compression-webpack-plugin": "^9.2.0",
         "license-loader": "^0.5.0",
         "license-webpack-plugin": "^4.0.2",
         "purgecss": "^4.1.3",
-        "sass": "^1.70.0",
+        "sass": "^1.54.5",
         "sass-loader": "^12.6.0",
-        "terser-webpack-plugin": "^5.3.10",
+        "terser-webpack-plugin": "^5.3.1",
-        "ts-loader": "^8.4.0",
+        "ts-loader": "^8.3.0",
-        "typescript": "^4.9.5",
+        "typescript": "^4.3.2",
-        "webpack": "^5.90.1",
+        "webpack": "^5.76.0",
-        "webpack-cli": "^4.10.0",
+        "webpack-cli": "^4.7.0",
-        "webpack-dev-server": "^4.15.1"
+        "webpack-dev-server": "^4.11.1"
     },
     "dependencies": {
-        "@popperjs/core": "^2.11.8",
+        "@popperjs/core": "^2.11.5",
-        "bootstrap": "^5.3.2",
+        "bootstrap": "^5.1.3",
-        "css-loader": "^5.2.7",
+        "css-loader": "^5.2.6",
         "debounce": "^1.2.1",
-        "preact": "^10.19.4",
+        "preact": "^10.7.1",
-        "react-bootstrap": "^2.10.1",
+        "react-bootstrap": "^2.2.3",
         "style-loader": "^2.0.0",
-        "xterm": "^4.19.0",
+        "xterm": "^4.12.0",
         "xterm-addon-fit": "^0.5.0",
         "xterm-addon-web-links": "^0.4.0",
         "xterm-addon-webgl": "^0.10.0",

js/src/bootstrap.scss

@@ -6,7 +6,6 @@
 // Configuration
 @import "functions";
 @import "variables";
-@import "variables-dark";
 @import "maps";
 @import "mixins";
 @import "utilities";

main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
@@ -68,7 +68,7 @@ func main() {
 
 		if appOptions.Quiet {
 			log.SetFlags(0)
-			log.SetOutput(io.Discard)
+			log.SetOutput(ioutil.Discard)
 		}
 
 		if c.IsSet("credential") {

server/server.go

@@ -6,10 +6,10 @@ import (
 	"crypto/x509"
 	"html/template"
 	"io/fs"
+	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
-	"os"
 	"regexp"
 	"strings"
 	noesctmpl "text/template"
@@ -45,7 +45,7 @@ func New(factory Factory, options *Options) (*Server, error) {
 	}
 	if options.IndexFile != "" {
 		path := homedir.Expand(options.IndexFile)
-		indexData, err = os.ReadFile(path)
+		indexData, err = ioutil.ReadFile(path)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to read custom index file at `%s`", path)
 		}
@@ -253,7 +253,7 @@ func (server *Server) setupHTTPServer(handler http.Handler) (*http.Server, error
 
 func (server *Server) tlsConfig() (*tls.Config, error) {
 	caFile := homedir.Expand(server.options.TLSCACrtFile)
-	caCert, err := os.ReadFile(caFile)
+	caCert, err := ioutil.ReadFile(caFile)
 	if err != nil {
 		return nil, errors.New("could not open CA crt file " + caFile)
 	}

server/ws_wrapper.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"io"
+	"io/ioutil"
 
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
@@ -31,7 +31,7 @@ func (wsw *wsWrapper) Read(p []byte) (n int, err error) {
 			continue
 		}
 
-		b, err := io.ReadAll(reader)
+		b, err := ioutil.ReadAll(reader)
 		if len(b) > len(p) {
 			return 0, errors.Wrapf(err, "Client message exceeded buffer size")
 		}

utils/flags.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"io/ioutil"
 	"log"
 	"os"
 	"reflect"
@@ -113,7 +114,7 @@ func ApplyConfigFile(filePath string, options ...interface{}) error {
 
 	fileString := []byte{}
 	log.Printf("Loading config file at: %s", filePath)
-	fileString, err := os.ReadFile(filePath)
+	fileString, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return err
 	}