Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jekyll from 4.2.0 to 4.3.2 in /docs #64

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
41 changes: 41 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
kind: pipeline
type: docker

steps:
- name: release_dev
image: plugins/docker
when:
branch:
- master
event:
- push
settings:
repo: registry.km8.es/admin-lte-dev
registry: registry.km8.es
username:
from_secret: docker_repo_user
password:
from_secret: docker_repo_password

- name: deploy_dev
image: appleboy/drone-ssh
when:
branch:
- master
event:
- push
settings:
host: 10.0.0.7
port: 22
username:
from_secret: web-01_ssh_user
key:
from_secret: web-01_ssh_key
passphrase:
from_secret: web-01_ssh_passphrase
script:
- cd /srv/docker/admin-lte
- docker-compose down
- docker-compose pull
- docker-compose up -d
19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM node:12 as releaser

COPY . /repo
WORKDIR /repo

RUN npm install && npm run production

FROM caddy

WORKDIR /web
COPY --from=releaser /repo/dist ./dist
COPY --from=releaser /repo/plugins ./plugins
COPY --from=releaser /repo/pages ./pages
COPY --from=releaser /repo/index.html ./index.html
COPY --from=releaser /repo/index2.html ./index2.html
COPY --from=releaser /repo/index3.html ./index3.html
COPY --from=releaser /repo/starter.html ./starter.html

CMD ["caddy", "file-server", "-root=/web"]
1 change: 0 additions & 1 deletion build/scss/_main-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

.sidebar {
height: calc(100% - (#{$main-header-height-inner} + #{$main-header-bottom-border-width}));
overflow-x: none;
overflow-y: initial;
padding-bottom: $sidebar-padding-y;
padding-left: $sidebar-padding-x;
Expand Down
Loading