Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ REDIS_URL="localhost:6379"
#
RETENTION_MINIMUM_GLACIER=90
RETENTION_MINIMUM_GLACIER_DEEP=180
RETENTION_MINIMUM_WASABI=90
RETENTION_MINIMUM_NEWSTORAGEOPTION=90
RETENTION_MINIMUM_STANDARD=0

#
Expand Down
2 changes: 1 addition & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# REDIS_URL
# RETENTION_MINIMUM_GLACIER
# RETENTION_MINIMUM_GLACIER_DEEP
# RETENTION_MINIMUM_WASABI
# RETENTION_MINIMUM_NEWSTORAGEOPTION
# RETENTION_MINIMUM_STANDARD
# SESSION_COOKIE_NAME
# SESSION_MAX_AGE
Expand Down
2 changes: 1 addition & 1 deletion .env.integration
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ REDIS_URL="localhost:6379"
#
RETENTION_MINIMUM_GLACIER=90
RETENTION_MINIMUM_GLACIER_DEEP=180
RETENTION_MINIMUM_WASABI=90
RETENTION_MINIMUM_NEWSTORAGEOPTION=90
RETENTION_MINIMUM_STANDARD=0


Expand Down
2 changes: 1 addition & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ REDIS_URL="localhost:6379"
#
RETENTION_MINIMUM_GLACIER=90
RETENTION_MINIMUM_GLACIER_DEEP=180
RETENTION_MINIMUM_WASABI=90
RETENTION_MINIMUM_NEWSTORAGEOPTION=90
RETENTION_MINIMUM_STANDARD=0


Expand Down
2 changes: 1 addition & 1 deletion .env.travis
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ REDIS_URL="localhost:6379"
#
RETENTION_MINIMUM_GLACIER=90
RETENTION_MINIMUM_GLACIER_DEEP=180
RETENTION_MINIMUM_WASABI=90
RETENTION_MINIMUM_NEWSTORAGEOPTION=90
RETENTION_MINIMUM_STANDARD=0

#
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.multi
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ ENV AWS_SNS_PWD=password
#Storage retention periods.
ENV RETENTION_MINIMUM_GLACIER=0
ENV RETENTION_MINIMUM_GLACIER_DEEP=0
ENV RETENTION_MINIMUM_WASABI=0
ENV RETENTION_MINIMUM_NEWSTORAGEOPTION=0
ENV RETENTION_MINIMUM_STANDARD=0
# Making a note for a new dockerfile test.
EXPOSE 8080
Expand Down
4 changes: 2 additions & 2 deletions cfn/cfn-registry-cluster.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ Resources:
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER'
- Name: RETENTION_MINIMUM_GLACIER_DEEP
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP'
- Name: RETENTION_MINIMUM_WASABI
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI'
- Name: RETENTION_MINIMUM_NEWSTORAGEOPTION
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION'
- Name: RETENTION_MINIMUM_STANDARD
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD'
- Name: AWS_SNS_USER
Expand Down
4 changes: 2 additions & 2 deletions cfn/cfn-registry-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ Resources:
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER'
- Name: RETENTION_MINIMUM_GLACIER_DEEP
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP'
- Name: RETENTION_MINIMUM_WASABI
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI'
- Name: RETENTION_MINIMUM_NEWSTORAGEOPTION
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION'
- Name: RETENTION_MINIMUM_STANDARD
ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD'
- Name: AWS_SNS_USER
Expand Down
2 changes: 1 addition & 1 deletion common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func loadConfig() *Config {
RetentionMinimum: &RetentionMinimum{
Glacier: v.GetInt("RETENTION_MINIMUM_GLACIER"),
GlacierDeep: v.GetInt("RETENTION_MINIMUM_GLACIER_DEEP"),
Wasabi: v.GetInt("RETENTION_MINIMUM_WASABI"),
Wasabi: v.GetInt("RETENTION_MINIMUM_NEWSTORAGEOPTION"),
Standard: v.GetInt("RETENTION_MINIMUM_STANDARD"),
},
}
Expand Down