Compare commits
No commits in common. "a3343c4f5d2244398ac25c4909727a8e41a2a6fb" and "a05f1ae473b73422d603090c1ca9daf7a605a454" have entirely different histories.
a3343c4f5d
...
a05f1ae473
68
.drone.yml
68
.drone.yml
@ -1,68 +0,0 @@
|
|||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: build-test-deploy
|
|
||||||
image_pull_secrets:
|
|
||||||
- registryLogins
|
|
||||||
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
arch: amd64
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: dockersock
|
|
||||||
host:
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: notify_start
|
|
||||||
image: plugins/slack
|
|
||||||
settings:
|
|
||||||
webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr
|
|
||||||
channel: git_builds
|
|
||||||
template: >
|
|
||||||
{{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}} CI build started
|
|
||||||
|
|
||||||
- name: build_and_test
|
|
||||||
image: registry.wizewerx.tech/base/wizewerx-docker-compose
|
|
||||||
volumes:
|
|
||||||
- name: dockersock
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
environment:
|
|
||||||
DOCKER_AUTH_CONFIG:
|
|
||||||
from_secret: registryLogins
|
|
||||||
commands:
|
|
||||||
- mkdir -p "/root/.docker" && echo $DOCKER_AUTH_CONFIG > "/root/.docker/config.json"
|
|
||||||
- export TEST_IMAGE_NAME=${DRONE_REPO_NAME}_app
|
|
||||||
- docker-compose -f ./docker/docker-compose-testing.yml -p ${DRONE_REPO_NAME} up --build --exit-code-from app && echo 'success'
|
|
||||||
- name: deploy
|
|
||||||
image: registry.wizewerx.tech/base/wizewerx-docker-compose
|
|
||||||
volumes:
|
|
||||||
- name: dockersock
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
environment:
|
|
||||||
DOCKER_AUTH_CONFIG:
|
|
||||||
from_secret: registryLogins
|
|
||||||
commands:
|
|
||||||
- mkdir -p "/root/.docker" && echo $DOCKER_AUTH_CONFIG > "/root/.docker/config.json"
|
|
||||||
- export TEST_IMAGE_NAME=${DRONE_REPO_NAME}_app
|
|
||||||
- export BUILD_TARGET=registry.wizewerx.tech/tools/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
|
|
||||||
- docker tag $TEST_IMAGE_NAME $BUILD_TARGET
|
|
||||||
- docker push $BUILD_TARGET
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
- name: notify_end
|
|
||||||
image: plugins/slack
|
|
||||||
settings:
|
|
||||||
webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr
|
|
||||||
channel: git_builds
|
|
||||||
username: mike
|
|
||||||
template: >
|
|
||||||
{{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}}{{#success build.status}} succeeded. Good job. {{else}} failed. FIX THE BUILD!!!.{{/success}}
|
|
||||||
Build took {{since build.started}}
|
|
||||||
when:
|
|
||||||
status: [ success, failure ]
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- master
|
|
||||||
92
.idea/workspace.xml
generated
92
.idea/workspace.xml
generated
@ -1,92 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="">
|
|
||||||
<change afterPath="$PROJECT_DIR$/.drone.yml" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/public/amalati/theme.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/amalati/theme.js" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
</component>
|
|
||||||
<component name="MarkdownSettingsMigration">
|
|
||||||
<option name="stateVersion" value="1" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectId" id="28QMnImbN1p35QBBgvMmZRQI8pI" />
|
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
||||||
<component name="ProjectViewState">
|
|
||||||
<option name="autoscrollFromSource" value="true" />
|
|
||||||
<option name="autoscrollToSource" value="true" />
|
|
||||||
<option name="foldersAlwaysOnTop" value="false" />
|
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
|
||||||
<option name="showLibraryContents" value="true" />
|
|
||||||
<option name="showMembers" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
|
||||||
"keyToString": {
|
|
||||||
"last_opened_file_path": "/home/mike/work/development/login_themes"
|
|
||||||
}
|
|
||||||
}]]></component>
|
|
||||||
<component name="RecentsManager">
|
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
|
||||||
<recent name="$PROJECT_DIR$" />
|
|
||||||
</key>
|
|
||||||
</component>
|
|
||||||
<component name="RunManager">
|
|
||||||
<configuration default="true" type="RackRunConfigurationType" factoryName="Rack">
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
||||||
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
|
|
||||||
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
||||||
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
|
|
||||||
<COVERAGE_PATTERN ENABLED="true">
|
|
||||||
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
||||||
</COVERAGE_PATTERN>
|
|
||||||
</EXTENSION>
|
|
||||||
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="PORT" VALUE="9292" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="CONFIG_FILE" VALUE="" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="RACK_SERVER_TYPE" VALUE="Default" />
|
|
||||||
<RACK_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="" />
|
|
||||||
<created>1651144522780</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1651144522780</updated>
|
|
||||||
<workItem from="1651144523986" duration="2372000" />
|
|
||||||
<workItem from="1651163609737" duration="1792000" />
|
|
||||||
</task>
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
|
||||||
<option name="version" value="3" />
|
|
||||||
</component>
|
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
|
||||||
<option name="TAB_STATES">
|
|
||||||
<map>
|
|
||||||
<entry key="MAIN">
|
|
||||||
<value>
|
|
||||||
<State />
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
FROM caddy:2
|
|
||||||
COPY /public /usr/share/caddy/
|
|
||||||
#APP=kc_themes && TARGET=master && docker build -f ./Dockerfile -t registry.wizewerx.tech/tools/$APP:$TARGET . && docker push registry.wizewerx.tech/tools/$APP:$TARGET
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
version: '3.3'
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
image: registry.wizewerx.tech/tools/kc_themes:master
|
|
||||||
networks:
|
|
||||||
- routable
|
|
||||||
logging:
|
|
||||||
driver: json-file
|
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
caddy: themes.wizewerx.tech
|
|
||||||
caddy.reverse_proxy: '{{upstreams 80}}'
|
|
||||||
networks:
|
|
||||||
routable:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
@ -5,5 +5,3 @@ document.onload = function () {
|
|||||||
privacyPolicy.innerHTML = '<span>By signing up you agree to the TheGardenPrivacy Policy <a href="https://thegarden.rocks/privacy/">Privacy Policy</a></span>'
|
privacyPolicy.innerHTML = '<span>By signing up you agree to the TheGardenPrivacy Policy <a href="https://thegarden.rocks/privacy/">Privacy Policy</a></span>'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
alert('Test Message');
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user