Compare commits

...
8 Commits
Author SHA1 Message Date
Dustin Pianalto 63e6212a0b debug errors
CI / build (push) Has been cancelled
2021-01-20 23:28:15 -09:00
Dustin Pianalto cbd899ff8c debug errors
CI / build (push) Has been cancelled
2021-01-20 23:22:23 -09:00
Dustin Pianalto c9ac3235db Fix syntax errors
CI / build (push) Has been cancelled
2021-01-20 23:18:30 -09:00
Dustin Pianalto 4dc9a6e846 Test adding migration files to container
CI / build (push) Has been cancelled
2021-01-20 23:04:17 -09:00
Dustin Pianalto 662db7cd9d Test adding migration files to container 2021-01-20 23:04:14 -09:00
Dustin Pianalto 57072010dc Test adding migration files to container
CI / build (push) Has been cancelled
2021-01-20 22:44:17 -09:00
Dustin Pianalto ab8db644cb Test adding migration files to container
CI / build (push) Has been cancelled
2021-01-20 22:40:15 -09:00
Dustin Pianalto 1d3a218e2d Check error when running migrations
CI / build (push) Has been cancelled
2021-01-20 22:37:04 -09:00
3 changed files with 8 additions and 6 deletions
+2
View File
@@ -8,6 +8,7 @@ RUN go mod download
COPY . . COPY . .
RUN go install github.com/dustinpianalto/geeksbot/... RUN go install github.com/dustinpianalto/geeksbot/...
RUN go get -u github.com/go-bindata/go-bindata/...
CMD [ "go", "run", "cmd/geeksbot/main.go"] CMD [ "go", "run", "cmd/geeksbot/main.go"]
@@ -16,5 +17,6 @@ from alpine
WORKDIR /bin WORKDIR /bin
COPY --from=dev /go/bin/geeksbot ./geeksbot COPY --from=dev /go/bin/geeksbot ./geeksbot
COPY --from=dev /go/bin/go-bindata ./go-bindata
CMD [ "geeksbot" ] CMD [ "geeksbot" ]
+2 -2
View File
@@ -36,13 +36,13 @@ func ConnectDatabase(dbConnString string) {
if err != nil { if err != nil {
log.Fatal(fmt.Errorf("cannot create db driver: %w", err)) log.Fatal(fmt.Errorf("cannot create db driver: %w", err))
} }
m, err := migrate.NewWithInstance("go-bindata", d, "postgres", instance) m, err := migrate.NewWithInstance("go-bindatafoo", d, "postgres", instance)
if err != nil { if err != nil {
log.Fatal(fmt.Errorf("cannot create migration instance: %w", err)) log.Fatal(fmt.Errorf("cannot create migration instance: %w", err))
} }
err = m.Up() err = m.Up()
if err != nil { if err != nil {
log.Fatal(fmt.Errorf("error running migrations: %w", err)) log.Fatal(err)
} }
log.Println("Migrations Run") log.Println("Migrations Run")
} }
@@ -5,7 +5,7 @@ BEGIN;
prefixes varchar(10)[], prefixes varchar(10)[],
PRIMARY KEY(id) PRIMARY KEY(id)
); );
CREATE TYPE IF NOT EXISTS role_type as ENUM ( CREATE TYPE role_type as ENUM (
'normal', 'normal',
'moderator', 'moderator',
'admin', 'admin',
@@ -25,7 +25,7 @@ BEGIN;
id varchar(30), id varchar(30),
guild_id varchar(30), guild_id varchar(30),
admin boolean, admin boolean,
default boolean, default_channel boolean,
new_patron boolean, new_patron boolean,
PRIMARY KEY(id), PRIMARY KEY(id),
CONSTRAINT fk_guild CONSTRAINT fk_guild
@@ -45,7 +45,7 @@ BEGIN;
id varchar(30), id varchar(30),
created_at timestamp, created_at timestamp,
modified_at timestamp, modified_at timestamp,
content varchar(2000) content varchar(2000),
previous_content varchar(2000)[], previous_content varchar(2000)[],
channel_id varchar(30), channel_id varchar(30),
author_id varchar(30), author_id varchar(30),
@@ -89,7 +89,7 @@ BEGIN;
REFERENCES roles(id) REFERENCES roles(id)
ON DELETE SET NULL, ON DELETE SET NULL,
CONSTRAINT fk_tier CONSTRAINT fk_tier
FOREIGN_KEY(next_tier) FOREIGN KEY(next_tier)
REFERENCES patreon_tier(id) REFERENCES patreon_tier(id)
ON DELETE SET NULL ON DELETE SET NULL
); );