Skip to content

Commit

Permalink
decko submodules, Gemfile updates, and new docker build for k8s
Browse files Browse the repository at this point in the history
  • Loading branch information
ethn committed Dec 4, 2024
1 parent 2c00837 commit 8c75b25
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 4 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build and publish Docker image

on:
push:
branches: [ main, staging ]

jobs:
build-and-push-image:
runs-on: ubuntu-latest

permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Log in to the Container registry
uses: docker/[email protected]
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata for Docker
id: meta
uses: docker/[email protected]
with:
images: ghcr.io/${{ github.repository }}
tags: |
type=raw,value={{sha}}
- name: Build and push Docker image
uses: docker/[email protected]
with:
push: true
file: vendor/decko/docker/repos/decko-k8s.dockerfile
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
[submodule "vendor/decko-cap"]
path = vendor/decko-cap
url = https://github.com/decko-commons/decko-cap.git
[submodule "vendor/decko"]
path = vendor/decko
url = [email protected]:decko-commons/decko.git
[submodule "vendor/card-mods"]
path = vendor/card-mods
url = [email protected]:ethn/card-mods.git
20 changes: 18 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
source "http://rubygems.org"

gem "decko"
gem "mysql2"
if ENV["RM_INFO"] && ARGV[0] == 'check'
puts "Execution in RubyMine detected in Gemfile. Ignoring decko gem path"
# This causes Rubymine and IntelliJ to handle these paths as normal sources rather
# than gems or libraries.
# That way the files are included as normal project sources in Find and Open.
else
gem "decko", path: "./vendor/decko"

path "./vendor/decko/mod" do
gem "card-mod-defaults"
gem "card-mod-delayed_job"
gem "card-mod-monkey", group: :development
end

gem "card-mod-new_relic", path: "./vendor/card-mods"
end

gem "mysql2", "> 0.4"

group :development do
gem "decko-cap", path: "./vendor/decko-cap"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,4 @@ DEPENDENCIES
puma

BUNDLED WITH
2.2.28
2.5.5
2 changes: 1 addition & 1 deletion config/boot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path("Gemfile")

require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
1 change: 1 addition & 0 deletions vendor/card-mods
Submodule card-mods added at 5e143d
1 change: 1 addition & 0 deletions vendor/decko
Submodule decko added at d191da

0 comments on commit 8c75b25

Please sign in to comment.