Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c671acf68f | ||
|
|
4f2cb5e184 | ||
|
|
63a065237a | ||
|
|
0f4e1888d9 | ||
|
|
d4d3308c34 |
@@ -1,7 +1,7 @@
|
|||||||
PATH
|
PATH
|
||||||
remote: .
|
remote: .
|
||||||
specs:
|
specs:
|
||||||
mrsk (0.6.2)
|
mrsk (0.6.3)
|
||||||
activesupport (>= 7.0)
|
activesupport (>= 7.0)
|
||||||
dotenv (~> 2.8)
|
dotenv (~> 2.8)
|
||||||
sshkit (~> 1.21)
|
sshkit (~> 1.21)
|
||||||
|
|||||||
13
README.md
13
README.md
@@ -253,11 +253,11 @@ This build secret can then be referenced in the Dockerfile:
|
|||||||
# Copy Gemfiles
|
# Copy Gemfiles
|
||||||
COPY Gemfile Gemfile.lock ./
|
COPY Gemfile Gemfile.lock ./
|
||||||
|
|
||||||
# Install dependencies, including private repositories via access token (then remove git configs with exposed GITHUB_TOKEN)
|
# Install dependencies, including private repositories via access token (then remove bundle cache with exposed GITHUB_TOKEN)
|
||||||
RUN --mount=type=secret,id=GITHUB_TOKEN \
|
RUN --mount=type=secret,id=GITHUB_TOKEN \
|
||||||
BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
|
BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
|
||||||
bundle install && \
|
bundle install && \
|
||||||
find /usr/local/bundle/cache/bundler/git -name "config" -delete
|
rm -rf /usr/local/bundle/cache
|
||||||
```
|
```
|
||||||
|
|
||||||
### Using command arguments for Traefik
|
### Using command arguments for Traefik
|
||||||
@@ -266,12 +266,13 @@ You can customize the traefik command line:
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
traefik:
|
traefik:
|
||||||
accesslog: true
|
args:
|
||||||
accesslog.format: json
|
accesslog: true
|
||||||
metrics.prometheus: true
|
accesslog.format: json
|
||||||
metrics.prometheus.buckets: 0.1,0.3,1.2,5.0
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
This will start the traefik container with `--accesslog=true accesslog.format=json`.
|
||||||
|
|
||||||
### Configuring build args for new images
|
### Configuring build args for new images
|
||||||
|
|
||||||
Build arguments that aren't secret can also be configured:
|
Build arguments that aren't secret can also be configured:
|
||||||
|
|||||||
@@ -107,10 +107,14 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
|
|||||||
desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
|
desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
|
||||||
def envify
|
def envify
|
||||||
if destination = options[:destination]
|
if destination = options[:destination]
|
||||||
File.write(".env.#{destination}", ERB.new(IO.read(Pathname.new(File.expand_path(".env.#{destination}.erb")))).result)
|
env_template_path = ".env.#{destination}.erb"
|
||||||
|
env_path = ".env.#{destination}"
|
||||||
else
|
else
|
||||||
File.write(".env", ERB.new(IO.read(Pathname.new(File.expand_path(".env.erb")))).result)
|
env_template_path = ".env.erb"
|
||||||
|
env_path = ".env"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
File.write(env_path, ERB.new(File.read(env_template_path)).result, perm: 0600)
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "remove", "Remove Traefik, app, and registry session from servers"
|
desc "remove", "Remove Traefik, app, and registry session from servers"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module Mrsk
|
module Mrsk
|
||||||
VERSION = "0.6.2"
|
VERSION = "0.6.3"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user