Skip to content

Commit

Permalink
Upgrade to JS 23.1
Browse files Browse the repository at this point in the history
  • Loading branch information
FayeSGW committed Nov 8, 2024
1 parent da3d6b1 commit ccace68
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 47 deletions.
33 changes: 0 additions & 33 deletions .circleci/config.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .github/workflows/force-ci-run
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

Edit this file for a quick way to force a CI run
0
26 changes: 26 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Main

on:
push:
branches:
- master

# These environment variables are used in the image builder script used to
# build Docker images
env:
PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Token for GHCR
PACKAGES_USERNAME: ${{ github.actor }} # Username for GHCR
REPO_NAME: ${{ github.event.repository.name }} # Repository name (so image_builder can check if it's testing itself)
TYPE: ${{ github.event_name }} # Event type (push or schedule) (so image_builder doesn't push images to GHCR on schedule)

jobs:

build-publish-trigger:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build image, test it, push it dockerhub, notify dependents
run: ./pipe_build_up_test.sh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![CircleCI](https://circleci.com/gh/cyber-dojo-languages/javascript-assert-jquery.svg?style=svg)](https://circleci.com/gh/cyber-dojo-languages/javascript-assert-jquery)
[![Github Action (main)](https://github.com/cyber-dojo-languages/javascript-assert-jquery/actions/workflows/main.yml/badge.svg)](https://github.com/cyber-dojo-languages/javascript-assert-jquery/actions)

## display_name="Javascript, assert+jQuery"
## image_name="cyberdojofoundation/javascript_node_assert_jquery"
## display_name="Javascript 23.1.0, assert+jQuery 3.7.1"
## image_name="ghcr.io/cyber-dojo-languages/javascript_node_assert_jquery"

![cyber-dojo.org home page](https://github.com/cyber-dojo/cyber-dojo/blob/master/shared/home_page_snapshot.png)
19 changes: 10 additions & 9 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# DO NOT EDIT THIS FILE. IT IS AUTO_GENERATED
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
FROM cyberdojofoundation/javascript-node_assert
FROM cyberdojofoundation/javascript-node:8afa909

# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# START of extra commands to fulfil runner's requirements (os=Ubuntu)
RUN (getent group sandbox) || (addgroup --gid 51966 sandbox)
RUN (grep -q sandbox:x:41966 /etc/passwd) || (adduser --disabled-password --gecos "" --home /home/sandbox --ingroup sandbox --shell /bin/bash --uid 41966 sandbox)
RUN apt-get update && apt-get install --yes coreutils bash tar file
# START of extra commands to fulfil runner's requirements (os=Alpine)
RUN (getent group sandbox) || (addgroup -g 51966 sandbox)
RUN (grep -q sandbox:x:41966 /etc/passwd) || (adduser -D -g "" -h /home/sandbox -G sandbox -s /bin/bash -u 41966 sandbox)
RUN apk add --update coreutils bash tar file
ARG GIT_COMMIT_SHA
ENV SHA=${GIT_COMMIT_SHA}
# END of extra commands to fulfil runner's requirements
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

LABEL maintainer=jon@jaggersoft.com

WORKDIR /usr/local/lib/node_modules
RUN npm install jsdom
RUN npm install jquery
ENV NODE_PATH /usr/local/lib/node_modules
RUN npm install --global jsdom jquery

COPY red_amber_green.rb /usr/local/bin
2 changes: 1 addition & 1 deletion docker/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberdojofoundation/javascript-node:8afa909
FROM ghcr.io/cyber-dojo-languages/javascript-node:3221b9d
LABEL maintainer=jon@jaggersoft.com

RUN npm install --global jsdom jquery
Expand Down
2 changes: 1 addition & 1 deletion docker/image_name.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"image_name": "cyberdojofoundation/javascript_node_assert_jquery"
"image_name": "ghcr.io/cyber-dojo-languages/javascript_node_assert_jquery"
}

0 comments on commit ccace68

Please sign in to comment.