diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2f18629..f7298ec 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,2 @@ -FROM kerberos/devcontainer:0a50dc9 +FROM kerberos/devcontainer:5da0fe7 LABEL AUTHOR=Kerberos.io diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 24fb271..dc4f250 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,33 +1,21 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-existing-dockerfile { "name": "A Dockerfile containing FFmpeg, OpenCV, Go and Yarn", - // Sets the run context to one level up instead of the .devcontainer folder. "context": "..", - // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. "dockerFile": "./Dockerfile", - // Use 'forwardPorts' to make a list of ports inside the container available locally. "forwardPorts": [ 3000, 80 ], - // Uncomment the next line to run commands after the container is created - for example installing curl. "postCreateCommand": "cd ui && yarn install && yarn build && cd ../machinery && go mod download", - "features": { - "ghcr.io/devcontainers-contrib/features/ansible:1": {} - }, "customizations": { "vscode": { "extensions": [ "ms-kubernetes-tools.vscode-kubernetes-tools", - "GitHub.copilot" + "ms-azuretools.vscode-docker", + "GitHub.copilot", + "golang.go", + "ms-vscode.vscode-typescript-next" ] } - }, - // Uncomment when using a ptrace-based debugger like C++, Go, and Rust - // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. - // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. - // "remoteUser": "vscode" + } } \ No newline at end of file diff --git a/machinery/go.mod b/machinery/go.mod index 6af83e5..6263d1d 100644 --- a/machinery/go.mod +++ b/machinery/go.mod @@ -19,7 +19,6 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang-module/carbon/v2 v2.3.12 github.com/gorilla/websocket v1.5.3 - github.com/izern/go-fdkaac v0.0.0-20191009124408-238be56e79c0 github.com/kellydunn/golang-geo v0.7.0 github.com/kerberos-io/joy4 v1.0.64 github.com/kerberos-io/onvif v0.0.14 diff --git a/machinery/go.sum b/machinery/go.sum index 196f504..3f3e85e 100644 --- a/machinery/go.sum +++ b/machinery/go.sum @@ -245,8 +245,6 @@ github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjG github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/izern/go-fdkaac v0.0.0-20191009124408-238be56e79c0 h1:otg6RJAMfzcWxfaS+tKPnd0y0kW9eRSgZBkReNEbm+M= -github.com/izern/go-fdkaac v0.0.0-20191009124408-238be56e79c0/go.mod h1:3p356dTlzzelLqCjamoXUIdMLOE5qRGz10Bva/XipdQ= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=