Skip to content

50 update dependencies #51

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

Open
BradHacker wants to merge 7 commits into
base: main
Choose a base branch
from
Open

50 update dependencies #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5e318e
Bump go version and update dependencies
BradHacker Dec 22, 2023
89a1566
Update ENT custom template
BradHacker Dec 22, 2023
c4aff6d
Regenerate ENT
BradHacker Dec 22, 2023
356434a
Update ENT field references
BradHacker Dec 22, 2023
12e77f2
Regenerate GraphQL
BradHacker Dec 22, 2023
66cef06
Update backend docker image
BradHacker Dec 22, 2023
5fdac14
Update Dockerfile zig version
BradHacker Dec 22, 2023
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
12 changes: 6 additions & 6 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
**/*.pyc
*.sqlite

node_modules
dist
**/node_modules
**/dist

*/builds/
*/logs/
*/users/
*/repos/
**/builds/
**/logs/
**/users/
**/repos/

session.cache
*.env
Expand Down
1 change: 1 addition & 0 deletions .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.21
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18.3-bullseye
FROM golang:1.21-bullseye

RUN set -eux; \
apt-get update; \
Expand All @@ -9,13 +9,13 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*

WORKDIR /
ADD https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz /zig-linux-x86_64-0.9.1.tar.xz
RUN tar -xvf /zig-linux-x86_64-0.9.1.tar.xz
ENV PATH="/zig-linux-x86_64-0.9.1:${PATH}"
ADD https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz /zig-linux-x86_64-0.11.0.tar.xz
RUN tar -xvf /zig-linux-x86_64-0.11.0.tar.xz
ENV PATH="/zig-linux-x86_64-0.11.0:${PATH}"

ADD https://github.com/mattnite/gyro/releases/download/0.5.0/gyro-0.5.0-linux-x86_64.tar.gz /gyro-0.5.0-linux-x86_64.tar.gz
RUN tar -xvf /gyro-0.5.0-linux-x86_64.tar.gz
ENV PATH="/gyro-0.5.0-linux-x86_64/bin:${PATH}"
# ADD https://github.com/mattnite/gyro/releases/download/0.5.0/gyro-0.5.0-linux-x86_64.tar.gz /gyro-0.5.0-linux-x86_64.tar.gz
# RUN tar -xvf /gyro-0.5.0-linux-x86_64.tar.gz
# ENV PATH="/gyro-0.5.0-linux-x86_64/bin:${PATH}"

RUN mkdir /app
ADD . /app/
Expand Down
6 changes: 3 additions & 3 deletions builder/vspherensxt/vspherensxt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ func (builder VSphereNSXTBuilder) generateBuildID(build *ent.Build) string {
}

func (builder VSphereNSXTBuilder) generateVmName(competition *ent.Competition, team *ent.Team, host *ent.Host, build *ent.Build) string {
return (competition.HclID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + host.Hostname + "-" + builder.generateBuildID(build))
return (competition.HCLID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + host.Hostname + "-" + builder.generateBuildID(build))
}

func (builder VSphereNSXTBuilder) generateRouterName(competition *ent.Competition, team *ent.Team, build *ent.Build) string {
return (competition.HclID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + builder.generateBuildID(build))
return (competition.HCLID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + builder.generateBuildID(build))
}

func (builder VSphereNSXTBuilder) generateNetworkName(competition *ent.Competition, team *ent.Team, network *ent.Network, build *ent.Build) string {
return (competition.HclID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + network.Name + "-" + builder.generateBuildID(build))
return (competition.HCLID + "-Team-" + fmt.Sprintf("%02d", team.TeamNumber) + "-" + network.Name + "-" + builder.generateBuildID(build))
}

// DeployHost deploys a given host from the environment to VSphere
Expand Down
105 changes: 80 additions & 25 deletions ent/adhocplan.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading